SHA256
Compare commits
5
Commits
| Author | SHA256 | Date | |
|---|---|---|---|
|
|
5db3ad8a3e | ||
|
|
e556615fa9 | ||
|
|
790740cd56 | ||
|
|
d91e4a32df | ||
|
|
9e7526fd81 |
+64
-7
@@ -10,6 +10,7 @@ import org.slf4j.LoggerFactory;
|
||||
import server.logic.ws_protocol.JSON.handlers.blockchain.Net_AddBlock_Handler;
|
||||
import server.sync.BlockchainResyncGuard;
|
||||
import shine.db.DbController;
|
||||
import shine.db.KeyEncodingUtil;
|
||||
import utils.config.AppConfig;
|
||||
import shine.db.dao.ArweaveBlockImportDAO;
|
||||
import shine.db.dao.BlockchainStateDAO;
|
||||
@@ -19,6 +20,7 @@ import shine.db.dao.CanonicalChainResolver;
|
||||
import shine.db.dao.ChannelReadStateDAO;
|
||||
import shine.db.dao.BlockchainResyncCleanupDAO;
|
||||
import shine.db.dao.SolanaUserPdaCurrentDAO;
|
||||
import shine.db.dao.RegistrationIdentityDAO;
|
||||
import shine.db.entities.BlockchainStateEntry;
|
||||
import shine.db.entities.SolanaUserPdaCurrentEntry;
|
||||
|
||||
@@ -225,7 +227,7 @@ public final class ArweaveBlockSyncService {
|
||||
if (pending.isEmpty()) break;
|
||||
for (ArweaveBlockImportDAO.QueueItem q : pending) {
|
||||
if (q.parsedLogin() == null || q.parsedForkNumber() == null || q.parsedBlockNumber() == null) continue;
|
||||
SolanaUserPdaCurrentEntry activeUser = usersDAO.getByLogin(q.parsedLogin());
|
||||
SolanaUserPdaCurrentEntry activeUser = resolveChainOwnerByLogin(q.parsedLogin());
|
||||
if (activeUser == null || activeUser.getBlockchainName() == null || activeUser.getBlockchainName().isBlank()) {
|
||||
importDAO.setPendingError(q.dataItemId(), "active_user_missing", System.currentTimeMillis());
|
||||
continue;
|
||||
@@ -257,7 +259,7 @@ public final class ArweaveBlockSyncService {
|
||||
progress = true;
|
||||
continue;
|
||||
}
|
||||
SolanaUserPdaCurrentEntry physicalUser = usersDAO.getByBlockchainKey(item.owner32());
|
||||
SolanaUserPdaCurrentEntry physicalUser = resolveChainOwnerByBlockchainKey(item.owner32());
|
||||
if (physicalUser == null || physicalUser.getBlockchainName() == null
|
||||
|| !q.parsedLogin().equalsIgnoreCase(physicalUser.getLogin())
|
||||
|| forkOf(physicalUser.getBlockchainName()) != q.parsedForkNumber()) {
|
||||
@@ -335,7 +337,7 @@ public final class ArweaveBlockSyncService {
|
||||
if (!item.verifySignature()) throw new IllegalArgumentException("bad ANS-104 signature");
|
||||
BchBlockEntry b = new BchBlockEntry(raw);
|
||||
|
||||
SolanaUserPdaCurrentEntry owner = usersDAO.getByBlockchainKey(item.owner32());
|
||||
SolanaUserPdaCurrentEntry owner = resolveChainOwnerByBlockchainKey(item.owner32());
|
||||
if (owner == null || owner.getBlockchainName() == null || owner.getLogin() == null) {
|
||||
importDAO.setPendingError(id, "unknown_owner", System.currentTimeMillis());
|
||||
continue;
|
||||
@@ -352,7 +354,7 @@ public final class ArweaveBlockSyncService {
|
||||
if (fork <= 1) throw new IllegalArgumentException("TECH_FORK cannot belong to fork1");
|
||||
if (b.blockNumber != fb.forkPointBlockNumber + 1)
|
||||
throw new IllegalArgumentException("TECH_FORK block number/fork point mismatch");
|
||||
SolanaUserPdaCurrentEntry parent = usersDAO.getByBlockchainKey(fb.parentBlockchainKey32);
|
||||
SolanaUserPdaCurrentEntry parent = resolveChainOwnerByBlockchainKey(fb.parentBlockchainKey32);
|
||||
if (parent == null || parent.getBlockchainName() == null
|
||||
|| !owner.getLogin().equalsIgnoreCase(parent.getLogin()))
|
||||
throw new IllegalArgumentException("TECH_FORK parent owner mismatch");
|
||||
@@ -388,6 +390,61 @@ public final class ArweaveBlockSyncService {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Обычный пользователь подтверждается текущим Solana PDA. У бесплатной регистрации PDA
|
||||
* намеренно отсутствует: её проверяемая идентичность хранится в сертификате. Для обеих
|
||||
* моделей импортёр должен сопоставить ANS-104 owner с уже проверенной локальной записью,
|
||||
* иначе блоки FREE_CERT никогда не смогут попасть на другой сервер.
|
||||
*/
|
||||
private SolanaUserPdaCurrentEntry resolveChainOwnerByLogin(String login) throws SQLException {
|
||||
SolanaUserPdaCurrentEntry solana = usersDAO.getByLogin(login);
|
||||
if (solana != null) return solana;
|
||||
|
||||
RegistrationIdentityDAO.ResolvedIdentity identity = RegistrationIdentityDAO.getInstance().get(login);
|
||||
if (identity == null || !identity.isFree() || identity.blockchainKey() == null || identity.blockchainKey().isBlank()) {
|
||||
return null;
|
||||
}
|
||||
return freeCertificateOwner(identity.fullLogin(), identity.blockchainKey());
|
||||
}
|
||||
|
||||
private SolanaUserPdaCurrentEntry resolveChainOwnerByBlockchainKey(byte[] owner32) throws SQLException {
|
||||
SolanaUserPdaCurrentEntry solana = usersDAO.getByBlockchainKey(owner32);
|
||||
if (solana != null) return solana;
|
||||
if (owner32 == null || owner32.length != 32) return null;
|
||||
|
||||
String blockchainKey = KeyEncodingUtil.encodeBase58(owner32);
|
||||
try (Connection c = DbController.getInstance().getConnection();
|
||||
PreparedStatement ps = c.prepareStatement("""
|
||||
SELECT login, blockchain_key
|
||||
FROM user_identity_current
|
||||
WHERE registration_status='FREE_CERT' AND blockchain_key=?
|
||||
LIMIT 1
|
||||
""")) {
|
||||
ps.setString(1, blockchainKey);
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
return rs.next() ? freeCertificateOwner(rs.getString("login"), rs.getString("blockchain_key")) : null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private SolanaUserPdaCurrentEntry resolveChainOwnerByBlockchainName(String blockchainName) throws SQLException {
|
||||
SolanaUserPdaCurrentEntry solana = usersDAO.getByBlockchainName(blockchainName);
|
||||
if (solana != null) return solana;
|
||||
if (blockchainName == null || !blockchainName.endsWith("-001")) return null;
|
||||
String login = blockchainName.substring(0, blockchainName.length() - 4);
|
||||
SolanaUserPdaCurrentEntry free = resolveChainOwnerByLogin(login);
|
||||
return free != null && blockchainName.equalsIgnoreCase(free.getBlockchainName()) ? free : null;
|
||||
}
|
||||
|
||||
private static SolanaUserPdaCurrentEntry freeCertificateOwner(String login, String blockchainKey) {
|
||||
SolanaUserPdaCurrentEntry owner = new SolanaUserPdaCurrentEntry();
|
||||
owner.setLogin(login);
|
||||
owner.setBlockchainName(login.toLowerCase(Locale.ROOT) + "-001");
|
||||
owner.setBlockchainKey(KeyEncodingUtil.base58KeyToBase64_32(blockchainKey));
|
||||
owner.setPaidLimitBytes(0L);
|
||||
return owner;
|
||||
}
|
||||
|
||||
private void ensureState(SolanaUserPdaCurrentEntry user, BchBlockEntry firstSeen) throws Exception {
|
||||
int fork=forkOf(user.getBlockchainName()); BlockchainStateEntry s=new BlockchainStateEntry();
|
||||
s.setBlockchainName(user.getBlockchainName());s.setLogin(user.getLogin());s.setBlockchainKey(user.getBlockchainKey());s.setSizeLimit(user.getPaidLimitBytes());s.setFileSizeBytes(0L);
|
||||
@@ -414,7 +471,7 @@ public final class ArweaveBlockSyncService {
|
||||
while(rs.next())logins.add(rs.getString(1));
|
||||
}
|
||||
for(String login:logins){
|
||||
SolanaUserPdaCurrentEntry u=usersDAO.getByLogin(login);
|
||||
SolanaUserPdaCurrentEntry u=resolveChainOwnerByLogin(login);
|
||||
if(u==null||u.getBlockchainName()==null)continue;
|
||||
replayDurableCanonicalStaging(login,forkOf(u.getBlockchainName()));
|
||||
}
|
||||
@@ -477,7 +534,7 @@ public final class ArweaveBlockSyncService {
|
||||
if(last<0)throw new IllegalStateException("canonical staging is empty for "+login);
|
||||
}
|
||||
private void replayDurableCanonicalStaging(String login,int activeFork)throws Exception{
|
||||
SolanaUserPdaCurrentEntry u=usersDAO.getByLogin(login);if(u==null)throw new IllegalStateException("user missing for canonical rebuild: "+login);
|
||||
SolanaUserPdaCurrentEntry u=resolveChainOwnerByLogin(login);if(u==null)throw new IllegalStateException("user missing for canonical rebuild: "+login);
|
||||
String activeName=u.getBlockchainName();boolean guard=BlockchainResyncGuard.tryBegin(activeName);if(!guard)throw new IllegalStateException("canonical rebuild already active: "+login);
|
||||
try{
|
||||
validateGenericStaging(login);
|
||||
@@ -487,7 +544,7 @@ public final class ArweaveBlockSyncService {
|
||||
ps.setString(1,login);try(ResultSet rs=ps.executeQuery()){while(rs.next()){
|
||||
int n=rs.getInt(1),f=rs.getInt(2);byte[] raw=rs.getBytes(3),hash=rs.getBytes(4);BchBlockEntry b=new BchBlockEntry(raw);
|
||||
String bch=login+"-"+String.format("%03d",f);
|
||||
if(f!=currentFork){SolanaUserPdaCurrentEntry forkOwner=usersDAO.getByBlockchainName(bch);long limit=forkOwner==null?0L:forkOwner.getPaidLimitBytes();BlockchainStateEntry st=new BlockchainStateEntry();st.setBlockchainName(bch);st.setLogin(login);st.setBlockchainKey(Base64.getEncoder().encodeToString(b.getOwner32()));st.setSizeLimit(limit);st.setFileSizeBytes(cumulative);st.setLastBlockNumber(prevNumber);st.setLastBlockHash(prevHash);st.setUpdatedAtMs(System.currentTimeMillis());stateDAO.insertIfMissing(st);currentFork=f;}
|
||||
if(f!=currentFork){SolanaUserPdaCurrentEntry forkOwner=resolveChainOwnerByBlockchainName(bch);long limit=forkOwner==null?0L:forkOwner.getPaidLimitBytes();BlockchainStateEntry st=new BlockchainStateEntry();st.setBlockchainName(bch);st.setLogin(login);st.setBlockchainKey(Base64.getEncoder().encodeToString(b.getOwner32()));st.setSizeLimit(limit);st.setFileSizeBytes(cumulative);st.setLastBlockNumber(prevNumber);st.setLastBlockHash(prevHash);st.setUpdatedAtMs(System.currentTimeMillis());stateDAO.insertIfMissing(st);currentFork=f;}
|
||||
Net_AddBlock_Handler.ArweaveImportResult r=addBlock.addBlockFromReplay(bch,raw);if(!r.ok())throw new IllegalStateException("canonical Arweave rebuild rejected #"+n+": "+r.reasonCode());
|
||||
cumulative+=raw.length;prevNumber=n;prevHash=hash;
|
||||
}}
|
||||
|
||||
@@ -35,6 +35,7 @@ public final class DatabaseInitializer {
|
||||
public static final int SCHEMA_VERSION_42 = 42;
|
||||
public static final int SCHEMA_VERSION_43 = 43;
|
||||
public static final int SCHEMA_VERSION_44 = 44;
|
||||
public static final int SCHEMA_VERSION_45 = 45;
|
||||
public static final String POSTGRES_SCHEMA_RESOURCE = "postgres/schema_v1.sql";
|
||||
public static final String POSTGRES_MIGRATION_V31_RESOURCE = "postgres/migration_v31.sql";
|
||||
public static final String POSTGRES_MIGRATION_V32_RESOURCE = "postgres/migration_v32.sql";
|
||||
@@ -50,6 +51,7 @@ public final class DatabaseInitializer {
|
||||
public static final String POSTGRES_MIGRATION_V42_RESOURCE = "postgres/migration_v42.sql";
|
||||
public static final String POSTGRES_MIGRATION_V43_RESOURCE = "postgres/migration_v43.sql";
|
||||
public static final String POSTGRES_MIGRATION_V44_RESOURCE = "postgres/migration_v44.sql";
|
||||
public static final String POSTGRES_MIGRATION_V45_RESOURCE = "postgres/migration_v45.sql";
|
||||
|
||||
private DatabaseInitializer() {}
|
||||
|
||||
@@ -197,9 +199,13 @@ public final class DatabaseInitializer {
|
||||
runSqlScript(conn, POSTGRES_MIGRATION_V44_RESOURCE);
|
||||
currentVersion = readCurrentSchemaVersion(conn);
|
||||
}
|
||||
if (currentVersion != SCHEMA_VERSION_44) {
|
||||
if (currentVersion == SCHEMA_VERSION_44) {
|
||||
runSqlScript(conn, POSTGRES_MIGRATION_V45_RESOURCE);
|
||||
currentVersion = readCurrentSchemaVersion(conn);
|
||||
}
|
||||
if (currentVersion != SCHEMA_VERSION_45) {
|
||||
throw new SQLException(
|
||||
"Unsupported SHiNE DB v2 schema version: expected 44, found " + currentVersion);
|
||||
"Unsupported SHiNE DB v2 schema version: expected 45, found " + currentVersion);
|
||||
}
|
||||
normalizeBlockchainStateKeysToBase64(conn);
|
||||
}
|
||||
|
||||
@@ -73,6 +73,47 @@ public final class ChannelNameStateDAO {
|
||||
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
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());
|
||||
@@ -87,8 +128,6 @@ public final class ChannelNameStateDAO {
|
||||
ps.setString(12, entry.getAvaPr() == null ? "" : entry.getAvaPr());
|
||||
ps.setLong(13, Math.max(0L, entry.getAvaSize()));
|
||||
ps.setLong(14, Math.max(0L, entry.getMetaUpdatedAtMs()));
|
||||
ps.executeUpdate();
|
||||
}
|
||||
}
|
||||
|
||||
public void updateMeta(Connection c, ChannelNameStateEntry entry) throws SQLException {
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
-- v45: FREE_CERT — полноценная identity без фиктивной Solana PDA.
|
||||
-- Обычные проекции и чтение blockchain выбирают ветку по user_identity_current;
|
||||
-- Solana PDA остаётся источником только Solana-специфичных данных.
|
||||
BEGIN;
|
||||
|
||||
CREATE OR REPLACE FUNCTION shine_identity_active_fork(p_login TEXT)
|
||||
RETURNS INTEGER
|
||||
LANGUAGE plpgsql
|
||||
STABLE
|
||||
AS $$
|
||||
DECLARE
|
||||
v_fork INTEGER;
|
||||
BEGIN
|
||||
SELECT substring(blockchain_name FROM '([0-9]{3})$')::INTEGER
|
||||
INTO v_fork
|
||||
FROM user_identity_current
|
||||
WHERE LOWER(login) = LOWER(BTRIM(p_login))
|
||||
LIMIT 1;
|
||||
|
||||
IF v_fork BETWEEN 1 AND 999 THEN
|
||||
RETURN v_fork;
|
||||
END IF;
|
||||
|
||||
SELECT fork_number
|
||||
INTO v_fork
|
||||
FROM blockchain_state_store
|
||||
WHERE LOWER(login) = LOWER(BTRIM(p_login))
|
||||
ORDER BY updated_at_ms DESC, fork_number DESC
|
||||
LIMIT 1;
|
||||
|
||||
RETURN COALESCE(v_fork, 1);
|
||||
END $$;
|
||||
|
||||
CREATE OR REPLACE FUNCTION shine_active_fork(p_login TEXT, p_block_number INTEGER)
|
||||
RETURNS INTEGER
|
||||
LANGUAGE sql
|
||||
STABLE
|
||||
AS $$
|
||||
SELECT shine_canonical_fork(p_login, shine_identity_active_fork(p_login), p_block_number)
|
||||
$$;
|
||||
|
||||
CREATE OR REPLACE FUNCTION shine_channel_names_state_refresh_owner_stats()
|
||||
RETURNS TRIGGER
|
||||
LANGUAGE plpgsql
|
||||
AS $$
|
||||
BEGIN
|
||||
IF TG_OP = 'DELETE' THEN
|
||||
PERFORM shine_refresh_user_stats(OLD.owner_login);
|
||||
RETURN OLD;
|
||||
END IF;
|
||||
PERFORM shine_refresh_user_stats(NEW.owner_login);
|
||||
RETURN NEW;
|
||||
END $$;
|
||||
|
||||
DROP TRIGGER IF EXISTS trg_channel_names_state_refresh_owner_stats ON channel_names_state;
|
||||
CREATE TRIGGER trg_channel_names_state_refresh_owner_stats
|
||||
AFTER INSERT OR UPDATE OF owner_login, channel_type_code, is_deleted OR DELETE
|
||||
ON channel_names_state
|
||||
FOR EACH ROW EXECUTE FUNCTION shine_channel_names_state_refresh_owner_stats();
|
||||
|
||||
-- Исправить уже записанные FREE_CERT и paid identity одним пересчётом.
|
||||
SELECT shine_refresh_user_stats(login) FROM user_identity_current;
|
||||
|
||||
UPDATE db_schema_version
|
||||
SET schema_version = 45,
|
||||
updated_at_ms = CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
|
||||
WHERE id = 1;
|
||||
COMMIT;
|
||||
+1
-1
@@ -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) {
|
||||
|
||||
+4
-1
@@ -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);
|
||||
|
||||
|
||||
+45
-36
@@ -41,7 +41,8 @@ public final class ChannelNamesStateBootstrapper {
|
||||
private static void rebuildFromBlocksOrThrow() {
|
||||
ChannelNameStateDAO dao = ChannelNameStateDAO.getInstance();
|
||||
List<ChannelNameStateEntry> entries = new ArrayList<>();
|
||||
Map<String, String> slugToIdentity = new LinkedHashMap<>();
|
||||
Map<String, ChannelNameStateEntry> entriesByOwnerTypeSlug = new LinkedHashMap<>();
|
||||
Map<ChannelRoot, ChannelNameStateEntry> replacedRoots = new LinkedHashMap<>();
|
||||
List<String> conflicts = new ArrayList<>();
|
||||
List<String> skipped = new ArrayList<>();
|
||||
|
||||
@@ -49,14 +50,7 @@ public final class ChannelNamesStateBootstrapper {
|
||||
SELECT login, bch_name, block_number, block_hash, block_bytes
|
||||
FROM blocks
|
||||
WHERE msg_type = ? AND msg_sub_type = ?
|
||||
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_active_fork(login, block_number)
|
||||
ORDER BY LOWER(login), block_number
|
||||
""";
|
||||
|
||||
@@ -115,14 +109,6 @@ public final class ChannelNamesStateBootstrapper {
|
||||
continue;
|
||||
}
|
||||
|
||||
String identity = ownerBch + "#" + blockNumber;
|
||||
String ownerTypeSlug = ownerLogin.toLowerCase(Locale.ROOT) + "|" + channelTypeCode + "|" + slug;
|
||||
String existing = slugToIdentity.putIfAbsent(ownerTypeSlug, identity);
|
||||
if (existing != null && !existing.equals(identity)) {
|
||||
conflicts.add("owner/type/slug=\"" + ownerTypeSlug + "\" conflicts: " + existing + " vs " + identity);
|
||||
continue;
|
||||
}
|
||||
|
||||
ChannelNameStateEntry entry = new ChannelNameStateEntry();
|
||||
entry.setSlug(slug);
|
||||
entry.setDisplayName(displayName);
|
||||
@@ -138,18 +124,28 @@ public final class ChannelNamesStateBootstrapper {
|
||||
entry.setChannelRootBlockNumber(blockNumber);
|
||||
entry.setChannelRootBlockHash(blockHash);
|
||||
entry.setCreatedAtMs(parsed.timestamp * 1000L);
|
||||
entries.add(entry);
|
||||
String ownerTypeSlug = ownerLogin.toLowerCase(Locale.ROOT) + "|" + channelTypeCode + "|" + slug;
|
||||
ChannelNameStateEntry previous = entriesByOwnerTypeSlug.put(ownerTypeSlug, entry);
|
||||
if (previous != null) {
|
||||
replacedRoots.put(new ChannelRoot(previous.getOwnerBlockchainName(), previous.getChannelRootBlockNumber(), previous.getChannelRootBlockHash()), entry);
|
||||
conflicts.add("owner/type/slug=\"" + ownerTypeSlug + "\" conflicts: "
|
||||
+ previous.getOwnerBlockchainName() + "#" + previous.getChannelRootBlockNumber()
|
||||
+ " vs " + ownerBch + "#" + blockNumber + "; kept newest root");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
entries.addAll(entriesByOwnerTypeSlug.values());
|
||||
|
||||
dao.clearAll(c);
|
||||
dao.insertAll(c, entries);
|
||||
redirectFollowedChannelRoots(c, replacedRoots);
|
||||
|
||||
applyMetaUpdates(c, dao, entries, skipped);
|
||||
applyDeletionStates(c, dao, skipped);
|
||||
// v18: counters are a projection, so rebuild them from current state after a full channel-name bootstrap.
|
||||
try (PreparedStatement ps = c.prepareStatement("SELECT shine_refresh_user_stats(login) FROM solana_user_pda_current")) {
|
||||
try (PreparedStatement ps = c.prepareStatement("SELECT shine_refresh_user_stats(login) FROM user_identity_current")) {
|
||||
ps.execute();
|
||||
}
|
||||
try (PreparedStatement ps = c.prepareStatement("""
|
||||
@@ -162,7 +158,7 @@ public final class ChannelNamesStateBootstrapper {
|
||||
c.commit();
|
||||
log.info("channel_names_state bootstrapped: {}", entries.size());
|
||||
if (!conflicts.isEmpty()) {
|
||||
log.warn("channel_names_state bootstrap detected {} slug conflicts (kept first occurrence)", conflicts.size());
|
||||
log.warn("channel_names_state bootstrap detected {} slug conflicts (kept newest root)", conflicts.size());
|
||||
int preview = Math.min(conflicts.size(), 10);
|
||||
for (int i = 0; i < preview; i++) {
|
||||
log.warn("channel_names_state conflict: {}", conflicts.get(i));
|
||||
@@ -192,19 +188,37 @@ public final class ChannelNamesStateBootstrapper {
|
||||
}
|
||||
}
|
||||
|
||||
/** Connections are a mutable projection. Keep follows on the current root when a legacy duplicate is replaced. */
|
||||
private static void redirectFollowedChannelRoots(Connection c,
|
||||
Map<ChannelRoot, ChannelNameStateEntry> replacedRoots) throws Exception {
|
||||
String sql = """
|
||||
UPDATE connections_state
|
||||
SET to_block_number = ?, to_block_hash = ?
|
||||
WHERE LOWER(to_login) = LOWER(?)
|
||||
AND to_block_number = ?
|
||||
AND to_block_hash = ?
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
for (Map.Entry<ChannelRoot, ChannelNameStateEntry> replacement : replacedRoots.entrySet()) {
|
||||
ChannelRoot oldRoot = replacement.getKey();
|
||||
ChannelNameStateEntry current = replacement.getValue();
|
||||
ps.setInt(1, current.getChannelRootBlockNumber());
|
||||
ps.setBytes(2, current.getChannelRootBlockHash());
|
||||
ps.setString(3, current.getOwnerLogin());
|
||||
ps.setInt(4, oldRoot.blockNumber());
|
||||
ps.setBytes(5, oldRoot.blockHash());
|
||||
ps.addBatch();
|
||||
}
|
||||
ps.executeBatch();
|
||||
}
|
||||
}
|
||||
|
||||
private static void applyDeletionStates(Connection c, ChannelNameStateDAO dao, List<String> skipped) throws Exception {
|
||||
String sql = """
|
||||
SELECT bch_name, block_number, block_bytes, msg_sub_type
|
||||
FROM blocks
|
||||
WHERE msg_type = ? AND msg_sub_type IN (?, ?, ?, ?, ?, ?, ?)
|
||||
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_active_fork(login, block_number)
|
||||
ORDER BY LOWER(login), block_number
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
@@ -233,6 +247,8 @@ public final class ChannelNamesStateBootstrapper {
|
||||
}
|
||||
}
|
||||
|
||||
private record ChannelRoot(String ownerBlockchainName, int blockNumber, byte[] blockHash) {}
|
||||
|
||||
private static void applyMetaUpdates(Connection c,
|
||||
ChannelNameStateDAO dao,
|
||||
List<ChannelNameStateEntry> entries,
|
||||
@@ -246,14 +262,7 @@ public final class ChannelNamesStateBootstrapper {
|
||||
SELECT login, bch_name, block_number, block_bytes
|
||||
FROM blocks
|
||||
WHERE msg_type = ? AND msg_sub_type = ?
|
||||
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_active_fork(login, block_number)
|
||||
ORDER BY LOWER(login), block_number
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
|
||||
+1
-2
@@ -158,14 +158,13 @@ public class Net_GetGroupDialog_Handler implements JsonMessageHandler {
|
||||
String sql = """
|
||||
SELECT login, bch_name, block_number, block_hash, block_bytes
|
||||
FROM blocks
|
||||
WHERE LOWER(login)=LOWER(?) AND msg_type=1 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)
|
||||
WHERE LOWER(login)=LOWER(?) AND msg_type=1 AND line_code=? AND fork_number=shine_active_fork(login,block_number)
|
||||
ORDER BY block_number ASC
|
||||
""";
|
||||
List<MsgRow> out = new ArrayList<>();
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
ps.setString(1, ChannelsReadSupport.loginFromChainName(ownerBch));
|
||||
ps.setInt(2, line);
|
||||
ps.setString(3, ChannelsReadSupport.loginFromChainName(ownerBch));
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
while (rs.next()) {
|
||||
MsgRow row = new MsgRow();
|
||||
|
||||
+5
-9
@@ -123,7 +123,7 @@ public class Net_GetMessageThread_Handler implements JsonMessageHandler {
|
||||
(msg_sub_type=? AND (LOWER(to_login)=LOWER(?) OR to_bch_name=?))
|
||||
OR (msg_sub_type=? AND LOWER(to_login)=LOWER(?))
|
||||
)
|
||||
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_active_fork(login,block_number)
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
ps.setInt(1, toBlockNumber);
|
||||
@@ -155,14 +155,13 @@ public class Net_GetMessageThread_Handler implements JsonMessageHandler {
|
||||
SELECT login,bch_name,block_number,block_hash,block_bytes,data_item_id,arweave_publish_pending,arweave_published_at_ms,to_login,to_bch_name,to_block_number,to_block_hash,line_code,msg_sub_type,this_line_number
|
||||
FROM blocks
|
||||
WHERE LOWER(login)=LOWER(?) AND block_number=? AND 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_active_fork(login,block_number)
|
||||
LIMIT 1
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
ps.setString(1, login);
|
||||
ps.setInt(2, blockNumber);
|
||||
ps.setBytes(3, blockHash);
|
||||
ps.setString(4, login);
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
return rs.next() ? mapRow(rs) : null;
|
||||
}
|
||||
@@ -174,14 +173,13 @@ public class Net_GetMessageThread_Handler implements JsonMessageHandler {
|
||||
SELECT login,bch_name,block_number,block_hash,block_bytes,data_item_id,arweave_publish_pending,arweave_published_at_ms,to_login,to_bch_name,to_block_number,to_block_hash,line_code,msg_sub_type,this_line_number
|
||||
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_active_fork(login,block_number)
|
||||
LIMIT 1
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
String login=ChannelsReadSupport.loginFromChainName(bchName);
|
||||
ps.setString(1, login);
|
||||
ps.setInt(2, blockNumber);
|
||||
ps.setString(3, login);
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
return rs.next() ? mapRow(rs) : null;
|
||||
}
|
||||
@@ -193,7 +191,7 @@ public class Net_GetMessageThread_Handler implements JsonMessageHandler {
|
||||
SELECT login,bch_name,block_number,block_hash,block_bytes,data_item_id,arweave_publish_pending,arweave_published_at_ms,to_login,to_bch_name,to_block_number,to_block_hash,line_code,msg_sub_type,this_line_number
|
||||
FROM blocks
|
||||
WHERE LOWER(login)=LOWER(?) AND block_number=? AND 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_active_fork(login,block_number)
|
||||
LIMIT 1
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
@@ -201,7 +199,6 @@ public class Net_GetMessageThread_Handler implements JsonMessageHandler {
|
||||
ps.setString(1, login);
|
||||
ps.setInt(2, blockNumber);
|
||||
ps.setBytes(3, blockHash);
|
||||
ps.setString(4, login);
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
return rs.next() ? mapRow(rs) : null;
|
||||
}
|
||||
@@ -321,7 +318,7 @@ public class Net_GetMessageThread_Handler implements JsonMessageHandler {
|
||||
FROM blocks
|
||||
WHERE LOWER(login)=LOWER(?) AND msg_type=1 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_active_fork(login,block_number)
|
||||
ORDER BY block_number ASC
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
@@ -330,7 +327,6 @@ public class Net_GetMessageThread_Handler implements JsonMessageHandler {
|
||||
ps.setInt(2, subType);
|
||||
ps.setInt(3, targetBlock);
|
||||
ps.setBytes(4, targetHash);
|
||||
ps.setString(5, login);
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
List<PostRow> out = new ArrayList<>();
|
||||
while (rs.next()) out.add(mapRow(rs));
|
||||
|
||||
+2
-3
@@ -89,7 +89,7 @@ public class Net_GetPersonalDiary_Handler implements JsonMessageHandler {
|
||||
private String loadPrimaryBlockchainName(Connection c, String canonicalLogin) throws Exception {
|
||||
try (PreparedStatement ps = c.prepareStatement("""
|
||||
SELECT blockchain_name
|
||||
FROM solana_user_pda_current
|
||||
FROM user_identity_current
|
||||
WHERE LOWER(login)=LOWER(?)
|
||||
LIMIT 1
|
||||
""")) {
|
||||
@@ -181,7 +181,7 @@ public class Net_GetPersonalDiary_Handler implements JsonMessageHandler {
|
||||
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_active_fork(login,block_number)
|
||||
ORDER BY block_number ASC
|
||||
""")) {
|
||||
ps.setString(1, ChannelsReadSupport.loginFromChainName(ownerBch));
|
||||
@@ -189,7 +189,6 @@ public class Net_GetPersonalDiary_Handler implements JsonMessageHandler {
|
||||
ps.setInt(3, shine.db.MsgSubType.TEXT_EDIT_REPLY);
|
||||
ps.setInt(4, originalBlockNumber);
|
||||
ps.setBytes(5, originalBlockHash);
|
||||
ps.setString(6, ChannelsReadSupport.loginFromChainName(ownerBch));
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
while (rs.next()) {
|
||||
ChannelsReadSupport.TextInfo editText = ChannelsReadSupport.parseTextAndTime(rs.getBytes("block_bytes"));
|
||||
|
||||
+2
-2
@@ -1,2 +1,2 @@
|
||||
client.version=1.20.66
|
||||
server.version=1.16.32
|
||||
client.version=1.20.67
|
||||
server.version=1.16.38
|
||||
|
||||
@@ -35,6 +35,7 @@
|
||||
- обязательный тестовый tag `App=test5592`;
|
||||
- для channel block — `c=<canonical_channel_slug>`;
|
||||
- новый `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=<slug>`; отдельной операции API для удаления канала нет;
|
||||
- `data` содержит SHiNE Frame v1 (`frameCode=1`).
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ blockchain.sync.enabled=false
|
||||
|
||||
Дополнительно каждый сервер может независимо включить `ArweaveBlockSyncScheduler`.
|
||||
|
||||
Он ищет child DataItems по тестовому тегу `App=test5592`, проверяет их и импортирует через ту же бизнес-проверку AddBlock. Импортированные блоки не публикуются повторно.
|
||||
Он ищет child DataItems по тестовому тегу `App=test5592`, проверяет их и импортирует через ту же бизнес-проверку AddBlock. Импортированные блоки не публикуются повторно. Владелец DataItem сверяется либо с актуальным Solana PDA, либо с уже проверенным локальным сертификатом бесплатной регистрации (`FREE_CERT`); для `FREE_CERT` допустима только chain `login-001` с ключом из сертификата.
|
||||
|
||||
Если блоки обнаружены не по порядку, persistent queue оставляет более поздние блоки pending до появления предыдущих.
|
||||
|
||||
|
||||
@@ -48,9 +48,15 @@
|
||||
- `SolanaUsersSyncService` + `PostgresStorageRepository` создают/перезаписывают snapshots; не допустить, чтобы sync очищал доверенные free-сертификаты или создавал дубль при Solana upgrade.
|
||||
- `ArweaveBlockSyncService` читает `solana_user_pda_current` и blockchain-данные: восстановление free должно оставаться независимым от факта существования реального Solana PDA.
|
||||
|
||||
## Решение для этапа 5 — пока НЕ принято
|
||||
## Принятое решение: единая identity без фиктивной PDA
|
||||
|
||||
Требование мастер-плана: одна логическая личность для `FREE_CERT` и `PAID_UPGRADED`; при free **нет on-chain PDA**, но сохраняются FK/индексы/функциональность сообщений, каналов, связей и сессий. Не вставлять фиктивный Solana snapshot со slot/signature только ради удовлетворения FK. Выбрать единый identity-index после проверки реальной схемы и протестировать:
|
||||
Одна логическая личность существует для `FREE_CERT` и `PAID_UPGRADED`; при free **нет on-chain PDA**, но сохраняются FK/индексы/функциональность сообщений, каналов, связей и сессий. Не вставлять фиктивный Solana snapshot со slot/signature только ради удовлетворения FK.
|
||||
|
||||
Обычные серверные операции обязаны использовать `user_identity_current`: он содержит подтверждённые сертификатом Arweave login, blockchain name и публичные ключи free-пользователя. `solana_user_pda_current` допустимо использовать только для функций, которым действительно нужны on-chain сведения: платежи, Solana-ротация ключей, PDA и маршруты из Solana.
|
||||
|
||||
Для чтения блокчейна SQL-функции `shine_identity_active_fork(login)` и `shine_active_fork(login, block_number)` выбирают ветку по общей identity; при отсутствии PDA используется актуальная запись `blockchain_state_store`, а последним fallback служит fork `1`. Это обеспечивает одинаковую работу каналов и обсуждений у free и paid пользователей.
|
||||
|
||||
После миграции статистика free-пользователей пересчитывается из `channel_names_state` и `connections_state`. Проверить:
|
||||
|
||||
1. создание free до появления в Solana, работа всех 15 зависимых таблиц;
|
||||
2. транзакционный upgrade без перегенерации root/blockchain/client и без переименования логина;
|
||||
|
||||
@@ -6,6 +6,7 @@ import * as explorerCanvasView from './network-canvas-v4/network-view.js';
|
||||
|
||||
const NETWORK_VERSION_STORAGE_KEY = 'shine.network.version';
|
||||
const MODES = new Set(['legacy', 'modern', 'explorer', 'explorer-canvas']);
|
||||
const DEFAULT_MODE = 'explorer-canvas';
|
||||
|
||||
// Нижняя вкладка сбрасывает только исследованный граф V3/V4, не изображения и не V1/V2.
|
||||
window.addEventListener('shine:network-tab-enter', explorerNetworkView.resetExplorerOnTabEntry);
|
||||
@@ -15,9 +16,9 @@ export const pageMeta = modernNetworkView.pageMeta;
|
||||
function selectedMode() {
|
||||
try {
|
||||
const saved = window.localStorage.getItem(NETWORK_VERSION_STORAGE_KEY);
|
||||
return MODES.has(saved) ? saved : 'modern';
|
||||
return MODES.has(saved) ? saved : DEFAULT_MODE;
|
||||
} catch {
|
||||
return 'modern';
|
||||
return DEFAULT_MODE;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -44,7 +45,7 @@ function createModeSwitcher(mode, navigate) {
|
||||
`;
|
||||
select.value = mode;
|
||||
select.addEventListener('change', () => {
|
||||
const nextMode = MODES.has(select.value) ? select.value : 'modern';
|
||||
const nextMode = MODES.has(select.value) ? select.value : DEFAULT_MODE;
|
||||
saveMode(nextMode);
|
||||
navigate?.('network-view');
|
||||
});
|
||||
|
||||
@@ -110,3 +110,9 @@ test('V3/V4: вход через нижнюю кнопку очищает исс
|
||||
assert.match(view, /void resetBarrier\.then\(async \(\) =>/);
|
||||
assert.doesNotMatch(switcher, /select\.addEventListener\('change',[\s\S]*resetExplorerOnTabEntry/);
|
||||
});
|
||||
|
||||
test('V4 Canvas открывается по умолчанию, но ранее выбранная версия сохраняется', () => {
|
||||
const switcher = readFileSync(new URL('../js/pages/network-version-switcher.js', import.meta.url), 'utf8');
|
||||
assert.match(switcher, /const DEFAULT_MODE = 'explorer-canvas';/);
|
||||
assert.match(switcher, /MODES\.has\(saved\) \? saved : DEFAULT_MODE/);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user