From 72e62127b305ebe5362f02dee7c9e869022afe0cae31990a087e432b5bf14d5f Mon Sep 17 00:00:00 2001 From: AidarKC Date: Tue, 6 Oct 2026 18:25:11 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D1=87=D0=B8=D0=BD=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20=D0=B8=D0=BC=D0=BF=D0=BE=D1=80=D1=82=20Arweave=20?= =?UTF-8?q?=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D1=80=D0=BE=D1=82=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D0=B8=20=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit При восстановлении сегментированного fork импорт теперь чинит пустой blockchain_state до точки fork. Это позволяет t3 принять блоки нового ключа change01 после ротации. --- .../src/main/java/server/archive/ArweaveBlockSyncService.java | 4 +++- VERSION.properties | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/SHiNE-server/shine-server-archive/src/main/java/server/archive/ArweaveBlockSyncService.java b/SHiNE-server/shine-server-archive/src/main/java/server/archive/ArweaveBlockSyncService.java index 094ba819..d43253be 100644 --- a/SHiNE-server/shine-server-archive/src/main/java/server/archive/ArweaveBlockSyncService.java +++ b/SHiNE-server/shine-server-archive/src/main/java/server/archive/ArweaveBlockSyncService.java @@ -366,10 +366,11 @@ public final class ArweaveBlockSyncService { } private void ensureState(SolanaUserPdaCurrentEntry user, BchBlockEntry firstSeen) throws Exception { - BlockchainStateEntry existing=stateDAO.getByBlockchainName(user.getBlockchainName()); if(existing!=null)return; 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()>0?user.getPaidLimitBytes():100_000L);s.setFileSizeBytes(0L); BlockchainForkSegmentsDAO.Segment seg=segmentsDAO.get(user.getLogin(),fork); + BlockchainStateEntry existing=stateDAO.getByBlockchainName(user.getBlockchainName()); + if(existing!=null && (seg==null || seg.parentForkNumber()==null || existing.getLastBlockNumber()>=seg.forkPointBlockNumber()))return; if(seg!=null&&seg.parentForkNumber()!=null){ s.setLastBlockNumber(seg.forkPointBlockNumber());s.setLastBlockHash(seg.forkPointBlockHash()); try(var c=shine.db.DbController.getInstance().getConnection();var ps=c.prepareStatement("SELECT COALESCE(SUM(octet_length(block_bytes)),0) FROM blocks_store WHERE LOWER(login)=LOWER(?) AND block_number<=? AND fork_number=shine_canonical_fork(?,?,block_number)")){ @@ -377,6 +378,7 @@ public final class ArweaveBlockSyncService { } } else{s.setLastBlockNumber(-1);s.setLastBlockHash(null);} s.setUpdatedAtMs(System.currentTimeMillis());stateDAO.insertIfMissing(s); + if(existing!=null)stateDAO.upsert(s); } private static int forkOf(String n){int d=n.lastIndexOf('-');return Integer.parseInt(n.substring(d+1));} diff --git a/VERSION.properties b/VERSION.properties index fb4940ca..388449ac 100644 --- a/VERSION.properties +++ b/VERSION.properties @@ -1,2 +1,2 @@ client.version=1.14.9 -server.version=1.12.7 +server.version=1.12.8