Compare commits

...
5 changed files with 77 additions and 13 deletions
@@ -10,6 +10,7 @@ import org.slf4j.LoggerFactory;
import server.logic.ws_protocol.JSON.handlers.blockchain.Net_AddBlock_Handler; import server.logic.ws_protocol.JSON.handlers.blockchain.Net_AddBlock_Handler;
import server.sync.BlockchainResyncGuard; import server.sync.BlockchainResyncGuard;
import shine.db.DbController; import shine.db.DbController;
import shine.db.KeyEncodingUtil;
import utils.config.AppConfig; import utils.config.AppConfig;
import shine.db.dao.ArweaveBlockImportDAO; import shine.db.dao.ArweaveBlockImportDAO;
import shine.db.dao.BlockchainStateDAO; import shine.db.dao.BlockchainStateDAO;
@@ -19,6 +20,7 @@ import shine.db.dao.CanonicalChainResolver;
import shine.db.dao.ChannelReadStateDAO; import shine.db.dao.ChannelReadStateDAO;
import shine.db.dao.BlockchainResyncCleanupDAO; import shine.db.dao.BlockchainResyncCleanupDAO;
import shine.db.dao.SolanaUserPdaCurrentDAO; import shine.db.dao.SolanaUserPdaCurrentDAO;
import shine.db.dao.RegistrationIdentityDAO;
import shine.db.entities.BlockchainStateEntry; import shine.db.entities.BlockchainStateEntry;
import shine.db.entities.SolanaUserPdaCurrentEntry; import shine.db.entities.SolanaUserPdaCurrentEntry;
@@ -225,7 +227,7 @@ public final class ArweaveBlockSyncService {
if (pending.isEmpty()) break; if (pending.isEmpty()) break;
for (ArweaveBlockImportDAO.QueueItem q : pending) { for (ArweaveBlockImportDAO.QueueItem q : pending) {
if (q.parsedLogin() == null || q.parsedForkNumber() == null || q.parsedBlockNumber() == null) continue; 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()) { if (activeUser == null || activeUser.getBlockchainName() == null || activeUser.getBlockchainName().isBlank()) {
importDAO.setPendingError(q.dataItemId(), "active_user_missing", System.currentTimeMillis()); importDAO.setPendingError(q.dataItemId(), "active_user_missing", System.currentTimeMillis());
continue; continue;
@@ -257,7 +259,7 @@ public final class ArweaveBlockSyncService {
progress = true; progress = true;
continue; continue;
} }
SolanaUserPdaCurrentEntry physicalUser = usersDAO.getByBlockchainKey(item.owner32()); SolanaUserPdaCurrentEntry physicalUser = resolveChainOwnerByBlockchainKey(item.owner32());
if (physicalUser == null || physicalUser.getBlockchainName() == null if (physicalUser == null || physicalUser.getBlockchainName() == null
|| !q.parsedLogin().equalsIgnoreCase(physicalUser.getLogin()) || !q.parsedLogin().equalsIgnoreCase(physicalUser.getLogin())
|| forkOf(physicalUser.getBlockchainName()) != q.parsedForkNumber()) { || forkOf(physicalUser.getBlockchainName()) != q.parsedForkNumber()) {
@@ -335,7 +337,7 @@ public final class ArweaveBlockSyncService {
if (!item.verifySignature()) throw new IllegalArgumentException("bad ANS-104 signature"); if (!item.verifySignature()) throw new IllegalArgumentException("bad ANS-104 signature");
BchBlockEntry b = new BchBlockEntry(raw); 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) { if (owner == null || owner.getBlockchainName() == null || owner.getLogin() == null) {
importDAO.setPendingError(id, "unknown_owner", System.currentTimeMillis()); importDAO.setPendingError(id, "unknown_owner", System.currentTimeMillis());
continue; continue;
@@ -352,7 +354,7 @@ public final class ArweaveBlockSyncService {
if (fork <= 1) throw new IllegalArgumentException("TECH_FORK cannot belong to fork1"); if (fork <= 1) throw new IllegalArgumentException("TECH_FORK cannot belong to fork1");
if (b.blockNumber != fb.forkPointBlockNumber + 1) if (b.blockNumber != fb.forkPointBlockNumber + 1)
throw new IllegalArgumentException("TECH_FORK block number/fork point mismatch"); 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 if (parent == null || parent.getBlockchainName() == null
|| !owner.getLogin().equalsIgnoreCase(parent.getLogin())) || !owner.getLogin().equalsIgnoreCase(parent.getLogin()))
throw new IllegalArgumentException("TECH_FORK parent owner mismatch"); 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 { private void ensureState(SolanaUserPdaCurrentEntry user, BchBlockEntry firstSeen) throws Exception {
int fork=forkOf(user.getBlockchainName()); BlockchainStateEntry s=new BlockchainStateEntry(); 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); 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)); while(rs.next())logins.add(rs.getString(1));
} }
for(String login:logins){ for(String login:logins){
SolanaUserPdaCurrentEntry u=usersDAO.getByLogin(login); SolanaUserPdaCurrentEntry u=resolveChainOwnerByLogin(login);
if(u==null||u.getBlockchainName()==null)continue; if(u==null||u.getBlockchainName()==null)continue;
replayDurableCanonicalStaging(login,forkOf(u.getBlockchainName())); 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); if(last<0)throw new IllegalStateException("canonical staging is empty for "+login);
} }
private void replayDurableCanonicalStaging(String login,int activeFork)throws Exception{ 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); String activeName=u.getBlockchainName();boolean guard=BlockchainResyncGuard.tryBegin(activeName);if(!guard)throw new IllegalStateException("canonical rebuild already active: "+login);
try{ try{
validateGenericStaging(login); validateGenericStaging(login);
@@ -487,7 +544,7 @@ public final class ArweaveBlockSyncService {
ps.setString(1,login);try(ResultSet rs=ps.executeQuery()){while(rs.next()){ 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); 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); 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()); 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; cumulative+=raw.length;prevNumber=n;prevHash=hash;
}} }}
+2 -2
View File
@@ -1,2 +1,2 @@
client.version=1.20.66 client.version=1.20.67
server.version=1.16.32 server.version=1.16.33
+1 -1
View File
@@ -40,7 +40,7 @@ blockchain.sync.enabled=false
Дополнительно каждый сервер может независимо включить `ArweaveBlockSyncScheduler`. Дополнительно каждый сервер может независимо включить `ArweaveBlockSyncScheduler`.
Он ищет child DataItems по тестовому тегу `App=test5592`, проверяет их и импортирует через ту же бизнес-проверку AddBlock. Импортированные блоки не публикуются повторно. Он ищет child DataItems по тестовому тегу `App=test5592`, проверяет их и импортирует через ту же бизнес-проверку AddBlock. Импортированные блоки не публикуются повторно. Владелец DataItem сверяется либо с актуальным Solana PDA, либо с уже проверенным локальным сертификатом бесплатной регистрации (`FREE_CERT`); для `FREE_CERT` допустима только chain `login-001` с ключом из сертификата.
Если блоки обнаружены не по порядку, persistent queue оставляет более поздние блоки pending до появления предыдущих. Если блоки обнаружены не по порядку, persistent queue оставляет более поздние блоки pending до появления предыдущих.
@@ -6,6 +6,7 @@ import * as explorerCanvasView from './network-canvas-v4/network-view.js';
const NETWORK_VERSION_STORAGE_KEY = 'shine.network.version'; const NETWORK_VERSION_STORAGE_KEY = 'shine.network.version';
const MODES = new Set(['legacy', 'modern', 'explorer', 'explorer-canvas']); const MODES = new Set(['legacy', 'modern', 'explorer', 'explorer-canvas']);
const DEFAULT_MODE = 'explorer-canvas';
// Нижняя вкладка сбрасывает только исследованный граф V3/V4, не изображения и не V1/V2. // Нижняя вкладка сбрасывает только исследованный граф V3/V4, не изображения и не V1/V2.
window.addEventListener('shine:network-tab-enter', explorerNetworkView.resetExplorerOnTabEntry); window.addEventListener('shine:network-tab-enter', explorerNetworkView.resetExplorerOnTabEntry);
@@ -15,9 +16,9 @@ export const pageMeta = modernNetworkView.pageMeta;
function selectedMode() { function selectedMode() {
try { try {
const saved = window.localStorage.getItem(NETWORK_VERSION_STORAGE_KEY); const saved = window.localStorage.getItem(NETWORK_VERSION_STORAGE_KEY);
return MODES.has(saved) ? saved : 'modern'; return MODES.has(saved) ? saved : DEFAULT_MODE;
} catch { } catch {
return 'modern'; return DEFAULT_MODE;
} }
} }
@@ -44,7 +45,7 @@ function createModeSwitcher(mode, navigate) {
`; `;
select.value = mode; select.value = mode;
select.addEventListener('change', () => { select.addEventListener('change', () => {
const nextMode = MODES.has(select.value) ? select.value : 'modern'; const nextMode = MODES.has(select.value) ? select.value : DEFAULT_MODE;
saveMode(nextMode); saveMode(nextMode);
navigate?.('network-view'); navigate?.('network-view');
}); });
@@ -110,3 +110,9 @@ test('V3/V4: вход через нижнюю кнопку очищает исс
assert.match(view, /void resetBarrier\.then\(async \(\) =>/); assert.match(view, /void resetBarrier\.then\(async \(\) =>/);
assert.doesNotMatch(switcher, /select\.addEventListener\('change',[\s\S]*resetExplorerOnTabEntry/); 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/);
});