diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/JsonHandlerRegistry.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/JsonHandlerRegistry.java index e0adcb9d..4f2251c0 100644 --- a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/JsonHandlerRegistry.java +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/JsonHandlerRegistry.java @@ -93,6 +93,7 @@ import server.logic.ws_protocol.JSON.handlers.channels.Net_GetMessageThread_Hand import server.logic.ws_protocol.JSON.handlers.channels.Net_GetMessageLikes_Handler; import server.logic.ws_protocol.JSON.handlers.channels.Net_GetSupportTotals_Handler; import server.logic.ws_protocol.JSON.handlers.channels.Net_GetSupportStats_Handler; +import server.logic.ws_protocol.JSON.handlers.channels.Net_GetSupportHistory_Handler; import server.logic.ws_protocol.JSON.handlers.channels.Net_GetPersonalDiary_Handler; import server.logic.ws_protocol.JSON.handlers.channels.Net_GetGroupDialog_Handler; import server.logic.ws_protocol.JSON.handlers.channels.Net_GetChannelsCounters_Handler; @@ -108,6 +109,7 @@ import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetMessageTh import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetMessageLikes_Request; import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetSupportTotals_Request; import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetSupportStats_Request; +import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetSupportHistory_Request; import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetPersonalDiary_Request; import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_ListGroupChats200_Request; import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_ListSubscriptionsFeed_Request; @@ -260,6 +262,7 @@ public final class JsonHandlerRegistry { Map.entry("GetMessageLikes", new Net_GetMessageLikes_Handler()), Map.entry("GetSupportTotals", new Net_GetSupportTotals_Handler()), Map.entry("GetSupportStats", new Net_GetSupportStats_Handler()), + Map.entry("GetSupportHistory", new Net_GetSupportHistory_Handler()), Map.entry("GetGroupDialog", new Net_GetGroupDialog_Handler()), Map.entry("ListGroupChats200", new Net_ListGroupChats200_Handler()), Map.entry("GetChannelsCounters", new Net_GetChannelsCounters_Handler()), @@ -375,6 +378,7 @@ public final class JsonHandlerRegistry { Map.entry("GetMessageLikes", Net_GetMessageLikes_Request.class), Map.entry("GetSupportTotals", Net_GetSupportTotals_Request.class), Map.entry("GetSupportStats", Net_GetSupportStats_Request.class), + Map.entry("GetSupportHistory", Net_GetSupportHistory_Request.class), Map.entry("GetGroupDialog", Net_GetGroupDialog_Request.class), Map.entry("ListGroupChats200", Net_ListGroupChats200_Request.class), Map.entry("GetChannelsCounters", Net_GetChannelsCounters_Request.class), diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_GetSupportHistory_Handler.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_GetSupportHistory_Handler.java new file mode 100644 index 00000000..d7b51882 --- /dev/null +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_GetSupportHistory_Handler.java @@ -0,0 +1,91 @@ +package server.logic.ws_protocol.JSON.handlers.channels; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import server.logic.ws_protocol.JSON.ConnectionContext; +import server.logic.ws_protocol.JSON.entyties.Net_Request; +import server.logic.ws_protocol.JSON.entyties.Net_Response; +import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler; +import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetSupportHistory_Request; +import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetSupportHistory_Response; +import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory; +import server.logic.ws_protocol.WireCodes; +import shine.db.DbController; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; + +/** Публичная постраничная история Stars из финализированного Helius-индекса. */ +public final class Net_GetSupportHistory_Handler implements JsonMessageHandler { + private static final Logger log = LoggerFactory.getLogger(Net_GetSupportHistory_Handler.class); + @Override + public Net_Response handle(Net_Request baseRequest, ConnectionContext context) { + Net_GetSupportHistory_Request req = (Net_GetSupportHistory_Request) baseRequest; + String login = req.getLogin() == null ? "" : req.getLogin().trim(); + if (login.isEmpty() || login.length() > 255 || login.chars().anyMatch(Character::isISOControl)) { + return NetExceptionResponseFactory.error(req, WireCodes.Status.BAD_REQUEST, + "bad_login", "Некорректный логин"); + } + int limit = req.getLimit() == null ? 20 : req.getLimit(); + int offset = req.getOffset() == null ? 0 : req.getOffset(); + if (limit < 1 || limit > 50 || offset < 0 || offset > 10_000) { + return NetExceptionResponseFactory.error(req, WireCodes.Status.BAD_REQUEST, + "bad_pagination", "Некорректные параметры страницы истории"); + } + Net_GetSupportHistory_Response response = new Net_GetSupportHistory_Response(); + response.setOp(req.getOp()); response.setRequestId(req.getRequestId()); + response.setStatus(WireCodes.Status.OK); + response.setLogin(login); response.setReady(false); + response.setTransfers(List.of()); response.setHasMore(false); + try (Connection c = DbController.getInstance().getConnection()) { + try (PreparedStatement ps = c.prepareStatement( + "SELECT history_complete FROM solana_support_sync_state WHERE id=1"); + ResultSet rs = ps.executeQuery()) { + if (!rs.next() || !rs.getBoolean(1)) return response; + } + response.setReady(true); + List entries = new ArrayList<>(); + try (PreparedStatement ps = c.prepareStatement(""" + SELECT signature,instruction_index,slot,block_time,kind,sender_login,recipient_login, + amount_lamports,amount_star_cents,recipient_star_cents,dao_star_cents,target_type, + channel_block_number,channel_block_hash,message_block_number,message_block_hash + FROM solana_support_transfers + WHERE lower(sender_login)=? OR lower(recipient_login)=? + ORDER BY slot DESC, instruction_index DESC, signature DESC LIMIT ? OFFSET ? + """)) { + String name = login.toLowerCase(Locale.ROOT); + ps.setString(1, name); ps.setString(2, name); + ps.setInt(3, limit + 1); ps.setInt(4, offset); + try (ResultSet rs = ps.executeQuery()) { + while (rs.next()) { + Long time = rs.getObject(4) == null ? null : rs.getLong(4); + entries.add(new Net_GetSupportHistory_Response.Transfer( + rs.getString(1), rs.getInt(2), rs.getLong(3), time, + rs.getString(5), rs.getString(6), rs.getString(7), + rs.getBigDecimal(8).toBigIntegerExact().toString(), + rs.getBigDecimal(9).toBigIntegerExact().toString(), + rs.getBigDecimal(10).toBigIntegerExact().toString(), + rs.getBigDecimal(11).toBigIntegerExact().toString(), + rs.getInt(12), + rs.getBigDecimal(13) == null ? null : rs.getBigDecimal(13).toBigIntegerExact().toString(), + rs.getString(14), + rs.getBigDecimal(15) == null ? null : rs.getBigDecimal(15).toBigIntegerExact().toString(), + rs.getString(16))); + } + } + } + response.setHasMore(entries.size() > limit); + response.setTransfers(entries.size() > limit ? entries.subList(0, limit) : entries); + return response; + } catch (SQLException e) { + log.error("GetSupportHistory failed", e); + return NetExceptionResponseFactory.error(req, WireCodes.Status.INTERNAL_ERROR, + "support_history_unavailable", "История поддержки временно недоступна"); + } + } +} diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_GetSupportStats_Handler.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_GetSupportStats_Handler.java index bdee6b95..5281fd35 100644 --- a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_GetSupportStats_Handler.java +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_GetSupportStats_Handler.java @@ -40,9 +40,9 @@ public final class Net_GetSupportStats_Handler implements JsonMessageHandler { result.setLogin(login); result.setAvailable(false); result.setReady(false); - result.setSupportSentLamports("0"); - result.setSupportReceivedLamports("0"); - result.setDaoDirectLamports("0"); + result.setSupportSentStarCents("0"); + result.setSupportReceivedStarCents("0"); + result.setDaoDirectStarCents("0"); try (Connection c = DbController.getInstance().getConnection()) { try (PreparedStatement ps = c.prepareStatement( "SELECT history_complete FROM solana_support_sync_state WHERE id=1")) { @@ -66,9 +66,9 @@ public final class Net_GetSupportStats_Handler implements JsonMessageHandler { ps.setString(1, login.toLowerCase(Locale.ROOT)); try (ResultSet rs = ps.executeQuery()) { if (rs.next()) { - result.setSupportSentLamports(rs.getBigDecimal(1).toBigIntegerExact().toString()); - result.setSupportReceivedLamports(rs.getBigDecimal(2).toBigIntegerExact().toString()); - result.setDaoDirectLamports(rs.getBigDecimal(3).toBigIntegerExact().toString()); + result.setSupportSentStarCents(rs.getBigDecimal(1).toBigIntegerExact().toString()); + result.setSupportReceivedStarCents(rs.getBigDecimal(2).toBigIntegerExact().toString()); + result.setDaoDirectStarCents(rs.getBigDecimal(3).toBigIntegerExact().toString()); } } } diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_GetSupportTotals_Handler.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_GetSupportTotals_Handler.java index cb3299c6..a76128e9 100644 --- a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_GetSupportTotals_Handler.java +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_GetSupportTotals_Handler.java @@ -32,13 +32,13 @@ public final class Net_GetSupportTotals_Handler implements JsonMessageHandler { response.setOp(request.getOp()); response.setRequestId(request.getRequestId()); response.setStatus(WireCodes.Status.OK); - response.setChannelReceivedLamports("0"); + response.setChannelReceivedStarCents("0"); response.setMessages(List.of()); try (Connection c = DbController.getInstance().getConnection()) { // Для каждой транзакции проверяем существование канала и соответствие // получателя оригинальному владельцу или автору блока публикации. String sql = """ - SELECT COALESCE(SUM(t.recipient_lamports),0) AS total + SELECT COALESCE(SUM(t.recipient_star_cents),0) AS total FROM solana_support_transfers t JOIN channel_names_state cn ON cn.channel_root_block_number = ? @@ -58,12 +58,12 @@ public final class Net_GetSupportTotals_Handler implements JsonMessageHandler { try (PreparedStatement p = c.prepareStatement(sql)) { p.setLong(1, number); p.setString(2, hash.toLowerCase(Locale.ROOT)); try (ResultSet r = p.executeQuery()) { - if (r.next()) response.setChannelReceivedLamports(r.getBigDecimal(1).toBigIntegerExact().toString()); + if (r.next()) response.setChannelReceivedStarCents(r.getBigDecimal(1).toBigIntegerExact().toString()); } } String messagesSql = """ SELECT t.message_block_number, t.message_block_hash, - SUM(t.recipient_lamports) AS total + SUM(t.recipient_star_cents) AS total FROM solana_support_transfers t JOIN channel_names_state cn ON cn.channel_root_block_number = ? diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_GetSupportHistory_Request.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_GetSupportHistory_Request.java new file mode 100644 index 00000000..fc4bacaa --- /dev/null +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_GetSupportHistory_Request.java @@ -0,0 +1,16 @@ +package server.logic.ws_protocol.JSON.handlers.channels.entyties; + +import server.logic.ws_protocol.JSON.entyties.Net_Request; + +/** Публичная история подтверждённых пожертвований; пагинация ограничена сервером. */ +public final class Net_GetSupportHistory_Request extends Net_Request { + private String login; + private Integer limit; + private Integer offset; + public String getLogin() { return login; } + public void setLogin(String v) { login = v; } + public Integer getLimit() { return limit; } + public void setLimit(Integer v) { limit = v; } + public Integer getOffset() { return offset; } + public void setOffset(Integer v) { offset = v; } +} diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_GetSupportHistory_Response.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_GetSupportHistory_Response.java new file mode 100644 index 00000000..989fc246 --- /dev/null +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_GetSupportHistory_Response.java @@ -0,0 +1,25 @@ +package server.logic.ws_protocol.JSON.handlers.channels.entyties; + +import server.logic.ws_protocol.JSON.entyties.Net_Response; +import java.util.List; + +/** Денежные суммы передаются строками: JS Number не вмещает u64. */ +public final class Net_GetSupportHistory_Response extends Net_Response { + private String login; + private boolean ready; + private boolean hasMore; + private List transfers; + public String getLogin() { return login; } + public void setLogin(String v) { login = v; } + public boolean isReady() { return ready; } + public void setReady(boolean v) { ready = v; } + public boolean isHasMore() { return hasMore; } + public void setHasMore(boolean v) { hasMore = v; } + public List getTransfers() { return transfers; } + public void setTransfers(List v) { transfers = v; } + public record Transfer(String signature, int instructionIndex, long slot, Long blockTime, + String kind, String senderLogin, String recipientLogin, String amountLamports, + String amountStarCents, String recipientStarCents, String daoStarCents, + int targetType, String channelBlockNumber, String channelBlockHash, + String messageBlockNumber, String messageBlockHash) { } +} diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_GetSupportStats_Response.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_GetSupportStats_Response.java index fb67619b..465c691d 100644 --- a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_GetSupportStats_Response.java +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_GetSupportStats_Response.java @@ -2,14 +2,14 @@ package server.logic.ws_protocol.JSON.handlers.channels.entyties; import server.logic.ws_protocol.JSON.entyties.Net_Response; -/** Суммы передаются строками в lamports: JS Number теряет точность u64. */ +/** Суммы передаются строками в сотых долях Stars: JS Number теряет точность u64. */ public final class Net_GetSupportStats_Response extends Net_Response { private String login; private boolean available; private boolean ready; - private String supportSentLamports; - private String supportReceivedLamports; - private String daoDirectLamports; + private String supportSentStarCents; + private String supportReceivedStarCents; + private String daoDirectStarCents; public String getLogin() { return login; } public void setLogin(String value) { login = value; } @@ -17,10 +17,10 @@ public final class Net_GetSupportStats_Response extends Net_Response { public void setAvailable(boolean value) { available = value; } public boolean isReady() { return ready; } public void setReady(boolean value) { ready = value; } - public String getSupportSentLamports() { return supportSentLamports; } - public void setSupportSentLamports(String value) { supportSentLamports = value; } - public String getSupportReceivedLamports() { return supportReceivedLamports; } - public void setSupportReceivedLamports(String value) { supportReceivedLamports = value; } - public String getDaoDirectLamports() { return daoDirectLamports; } - public void setDaoDirectLamports(String value) { daoDirectLamports = value; } + public String getSupportSentStarCents() { return supportSentStarCents; } + public void setSupportSentStarCents(String value) { supportSentStarCents = value; } + public String getSupportReceivedStarCents() { return supportReceivedStarCents; } + public void setSupportReceivedStarCents(String value) { supportReceivedStarCents = value; } + public String getDaoDirectStarCents() { return daoDirectStarCents; } + public void setDaoDirectStarCents(String value) { daoDirectStarCents = value; } } diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_GetSupportTotals_Response.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_GetSupportTotals_Response.java index 39084611..74030906 100644 --- a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_GetSupportTotals_Response.java +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_GetSupportTotals_Response.java @@ -4,11 +4,11 @@ import server.logic.ws_protocol.JSON.entyties.Net_Response; import java.util.List; public class Net_GetSupportTotals_Response extends Net_Response { - private String channelReceivedLamports; + private String channelReceivedStarCents; private List messages; - public String getChannelReceivedLamports() { return channelReceivedLamports; } - public void setChannelReceivedLamports(String value) { channelReceivedLamports = value; } + public String getChannelReceivedStarCents() { return channelReceivedStarCents; } + public void setChannelReceivedStarCents(String value) { channelReceivedStarCents = value; } public List getMessages() { return messages; } public void setMessages(List value) { messages = value; } - public record MessageTotal(String blockNumber, String blockHash, String receivedLamports) {} + public record MessageTotal(String blockNumber, String blockHash, String receivedStarCents) {} } diff --git a/SHiNE-server/shine-server-solana-users-sync/src/main/java/sync/codec/ShineUsersCodec.java b/SHiNE-server/shine-server-solana-users-sync/src/main/java/sync/codec/ShineUsersCodec.java index 427392d3..cbd8fcce 100644 --- a/SHiNE-server/shine-server-solana-users-sync/src/main/java/sync/codec/ShineUsersCodec.java +++ b/SHiNE-server/shine-server-solana-users-sync/src/main/java/sync/codec/ShineUsersCodec.java @@ -197,21 +197,20 @@ public final class ShineUsersCodec { null ); - // Поддержки индексируются по экономическому PDA. Из параметров не - // восстанавливается PDA: истина о счётчиках всегда читается из Solana. + // Основной PDA-sync должен знать только логин отправителя. + // Финансовый индексатор отдельно декодирует Stars, проверяет события + // и отбрасывает историю старого тестового протокола. Здесь нельзя + // разбирать старые поля как новый target: иначе sync может упасть + // на транзакциях до обновления программы в Devnet. case IX_SUPPORT_USER -> { String senderLogin = reader.readStringU8(); - reader.readStringU8(); - reader.readU64(); - int target = reader.readU8(); - if (target == 1) { reader.readU64(); reader.readFixed(32); } - else if (target == 2) { reader.readU64(); reader.readFixed(32); reader.readU64(); reader.readFixed(32); } - else if (target != 0) throw new IllegalArgumentException("Invalid support target"); yield new ParsedInstruction(TxKind.SUPPORT_USER, false, null, senderLogin, null, null); } - case IX_SUPPORT_DAO -> new ParsedInstruction( - TxKind.SUPPORT_DAO, false, null, reader.readStringU8(), null, null); + case IX_SUPPORT_DAO -> { + String senderLogin = reader.readStringU8(); + yield new ParsedInstruction(TxKind.SUPPORT_DAO, false, null, senderLogin, null, null); + } default -> new ParsedInstruction( @@ -273,15 +272,16 @@ public final class ShineUsersCodec { throw new IllegalArgumentException("Unsupported PDA format " + formatMajor + "." + formatMinor); } - /** Неподписанный блок после record_len; v0 совместим с ранее созданными PDA. */ + /** Счётчики Stars в сотых долях; версии с lamports не поддерживаются. */ public static SupportStats parseSupportStats(byte[] raw) { if (raw == null || raw.length < 9) throw new IllegalArgumentException("PDA record too short"); int recordLen = u16le(raw, 7); if (recordLen > raw.length) throw new IllegalArgumentException("Invalid record_len"); if (recordLen == raw.length || raw[recordLen] == 0) return new SupportStats(0, 0L, 0L, 0L); - if ((raw[recordLen] & 0xFF) != 1) throw new IllegalArgumentException("Unsupported support stats version"); + if ((raw[recordLen] & 0xFF) == 1) return new SupportStats(2, 0L, 0L, 0L); // старые lamports игнорируем + if ((raw[recordLen] & 0xFF) != 2) throw new IllegalArgumentException("Unsupported support stats version; required Stars v2"); if (recordLen + 25 > raw.length) throw new IllegalArgumentException("Truncated support stats"); - return new SupportStats(1, u64le(raw, recordLen + 1), u64le(raw, recordLen + 9), u64le(raw, recordLen + 17)); + return new SupportStats(2, u64le(raw, recordLen + 1), u64le(raw, recordLen + 9), u64le(raw, recordLen + 17)); } private static long u64le(byte[] bytes, int offset) { diff --git a/SHiNE-server/shine-server-solana-users-sync/src/main/java/sync/service/SupportHistoryIndexer.java b/SHiNE-server/shine-server-solana-users-sync/src/main/java/sync/service/SupportHistoryIndexer.java index 55836e94..c2f849ff 100644 --- a/SHiNE-server/shine-server-solana-users-sync/src/main/java/sync/service/SupportHistoryIndexer.java +++ b/SHiNE-server/shine-server-solana-users-sync/src/main/java/sync/service/SupportHistoryIndexer.java @@ -113,27 +113,36 @@ public final class SupportHistoryIndexer { "signature TEXT NOT NULL, instruction_index INT NOT NULL, slot BIGINT NOT NULL, " + "block_time BIGINT, kind TEXT NOT NULL, sender_login TEXT NOT NULL, recipient_login TEXT, " + "amount_lamports NUMERIC(20,0) NOT NULL, recipient_lamports NUMERIC(20,0) NOT NULL, " + - "inflow_lamports NUMERIC(20,0) NOT NULL, target_type SMALLINT NOT NULL, " + + "inflow_lamports NUMERIC(20,0) NOT NULL, " + + "amount_star_cents NUMERIC(20,0) NOT NULL, recipient_star_cents NUMERIC(20,0) NOT NULL, dao_star_cents NUMERIC(20,0) NOT NULL, target_type SMALLINT NOT NULL, " + "channel_block_number NUMERIC(20,0), channel_block_hash TEXT, " + "message_block_number NUMERIC(20,0), message_block_hash TEXT, " + "PRIMARY KEY(signature, instruction_index))"); + // Существующая t2/test БД могла содержать legacy-таблицу без Stars-полей. + // CREATE TABLE IF NOT EXISTS её не меняет, поэтому мигрируем добавленные поля отдельно. + s.executeUpdate("ALTER TABLE solana_support_transfers ADD COLUMN IF NOT EXISTS amount_star_cents NUMERIC(20,0) NOT NULL DEFAULT 0"); + s.executeUpdate("ALTER TABLE solana_support_transfers ADD COLUMN IF NOT EXISTS recipient_star_cents NUMERIC(20,0) NOT NULL DEFAULT 0"); + s.executeUpdate("ALTER TABLE solana_support_transfers ADD COLUMN IF NOT EXISTS dao_star_cents NUMERIC(20,0) NOT NULL DEFAULT 0"); + s.executeUpdate("ALTER TABLE solana_support_transfers ADD COLUMN IF NOT EXISTS target_type SMALLINT NOT NULL DEFAULT 0"); s.executeUpdate("CREATE INDEX IF NOT EXISTS solana_support_by_channel ON solana_support_transfers(channel_block_hash, channel_block_number)"); s.executeUpdate("CREATE INDEX IF NOT EXISTS solana_support_by_message ON solana_support_transfers(message_block_hash, message_block_number)"); s.executeUpdate("CREATE INDEX IF NOT EXISTS solana_support_by_sender ON solana_support_transfers(sender_login)"); s.executeUpdate("CREATE INDEX IF NOT EXISTS solana_support_by_recipient ON solana_support_transfers(recipient_login)"); + // Старые view могли иметь колонки received_lamports; OR REPLACE не меняет их имена. + s.executeUpdate("DROP VIEW IF EXISTS solana_support_channel_totals"); + s.executeUpdate("DROP VIEW IF EXISTS solana_support_message_totals"); s.executeUpdate("CREATE OR REPLACE VIEW solana_support_channel_totals AS SELECT channel_block_number, channel_block_hash, " + - "SUM(recipient_lamports) AS received_lamports, COUNT(*) AS transfers FROM solana_support_transfers " + + "SUM(recipient_star_cents) AS received_star_cents, COUNT(*) AS transfers FROM solana_support_transfers " + "WHERE kind='USER' AND target_type IN (1,2) GROUP BY channel_block_number, channel_block_hash"); s.executeUpdate("CREATE OR REPLACE VIEW solana_support_message_totals AS SELECT channel_block_number, channel_block_hash, " + - "message_block_number, message_block_hash, SUM(recipient_lamports) AS received_lamports, COUNT(*) AS transfers " + + "message_block_number, message_block_hash, SUM(recipient_star_cents) AS received_star_cents, COUNT(*) AS transfers " + "FROM solana_support_transfers WHERE kind='USER' AND target_type=2 " + "GROUP BY channel_block_number, channel_block_hash, message_block_number, message_block_hash"); } backfillUserStats(c); } - /** Однократная миграция прежнего журнала. Исторические записи уже могли быть - * синхронизированы до появления кеша; перестраиваем его транзакционно. */ + /** For clean test deployment only; aggregates v2 Stars events, NEVER legacy lamports. */ private static void backfillUserStats(Connection c) throws SQLException { boolean previousAutocommit = c.getAutoCommit(); c.setAutoCommit(false); @@ -152,13 +161,13 @@ public final class SupportHistoryIndexer { SELECT lower(btrim(login)), SUM(sent), SUM(received), SUM(direct) FROM ( SELECT sender_login AS login, - CASE WHEN kind='USER' THEN amount_lamports ELSE 0 END AS sent, + CASE WHEN kind='USER' THEN amount_star_cents ELSE 0 END AS sent, 0::NUMERIC AS received, - CASE WHEN kind='DAO' THEN amount_lamports ELSE 0 END AS direct + CASE WHEN kind='DAO' THEN amount_star_cents ELSE 0 END AS direct FROM solana_support_transfers UNION ALL SELECT recipient_login AS login, 0::NUMERIC AS sent, - recipient_lamports AS received, 0::NUMERIC AS direct + recipient_star_cents AS received, 0::NUMERIC AS direct FROM solana_support_transfers WHERE kind='USER' ) history GROUP BY lower(btrim(login)) @@ -180,11 +189,11 @@ public final class SupportHistoryIndexer { public static List userStatsIncrements(SupportEvent event) { if ("USER".equals(event.kind())) { return List.of( - new UserStatsIncrement(event.sender(), event.amount(), BigInteger.ZERO, BigInteger.ZERO), - new UserStatsIncrement(event.recipient(), BigInteger.ZERO, event.recipientAmount(), BigInteger.ZERO)); + new UserStatsIncrement(event.sender(), event.stars(), BigInteger.ZERO, BigInteger.ZERO), + new UserStatsIncrement(event.recipient(), BigInteger.ZERO, event.recipientStars(), BigInteger.ZERO)); } if ("DAO".equals(event.kind())) { - return List.of(new UserStatsIncrement(event.sender(), BigInteger.ZERO, BigInteger.ZERO, event.amount())); + return List.of(new UserStatsIncrement(event.sender(), BigInteger.ZERO, BigInteger.ZERO, event.stars())); } throw new IllegalArgumentException("Unknown support event kind"); } @@ -219,8 +228,8 @@ public final class SupportHistoryIndexer { private static boolean insert(Connection c, SolanaRpcClient.SignatureRecord signature, SupportEvent event) throws SQLException { try (PreparedStatement s = c.prepareStatement("INSERT INTO solana_support_transfers (" + "signature,instruction_index,slot,block_time,kind,sender_login,recipient_login,amount_lamports," + - "recipient_lamports,inflow_lamports,target_type,channel_block_number,channel_block_hash," + - "message_block_number,message_block_hash) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ON CONFLICT DO NOTHING")) { + "recipient_lamports,inflow_lamports,amount_star_cents,recipient_star_cents,dao_star_cents,target_type,channel_block_number,channel_block_hash," + + "message_block_number,message_block_hash) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ON CONFLICT DO NOTHING")) { s.setString(1, signature.signature()); s.setInt(2, event.index()); s.setLong(3, signature.slot()); @@ -231,20 +240,37 @@ public final class SupportHistoryIndexer { s.setBigDecimal(8, new java.math.BigDecimal(event.amount())); s.setBigDecimal(9, new java.math.BigDecimal(event.recipientAmount())); s.setBigDecimal(10, new java.math.BigDecimal(event.inflowAmount())); - s.setInt(11, event.target()); - if (event.channelNumber() == null) s.setNull(12, Types.NUMERIC); else s.setBigDecimal(12, new java.math.BigDecimal(event.channelNumber())); - s.setString(13, event.channelHash()); - if (event.messageNumber() == null) s.setNull(14, Types.NUMERIC); else s.setBigDecimal(14, new java.math.BigDecimal(event.messageNumber())); - s.setString(15, event.messageHash()); + s.setBigDecimal(11, new java.math.BigDecimal(event.stars())); + s.setBigDecimal(12, new java.math.BigDecimal(event.recipientStars())); + s.setBigDecimal(13, new java.math.BigDecimal(event.daoStars())); + s.setInt(14, event.target()); + if (event.channelNumber() == null) s.setNull(15, Types.NUMERIC); else s.setBigDecimal(15, new java.math.BigDecimal(event.channelNumber())); + s.setString(16, event.channelHash()); + if (event.messageNumber() == null) s.setNull(17, Types.NUMERIC); else s.setBigDecimal(17, new java.math.BigDecimal(event.messageNumber())); + s.setString(18, event.messageHash()); return s.executeUpdate() == 1; } } - /** Decode ALL top-level instructions: one transaction may contain several donations. */ + /** + * События Stars обязательны для новых инструкций. Данные старой тестовой + * программы (до Stars) пропускаем только если у них нет формата новых + * параметров И нет событий SHINE_STARS_V1. Такая история не мигрируется. + */ public static List decodeTransaction(JsonNode transaction, String programId) { if (transaction.path("meta").hasNonNull("err")) return List.of(); JsonNode instructions = transaction.path("transaction").path("message").path("instructions"); if (!instructions.isArray()) throw new IllegalArgumentException("Transaction instructions missing"); + JsonNode logs = transaction.path("meta").path("logMessages"); + Map counts = new HashMap<>(); + if (logs.isArray()) for (JsonNode line : logs) { + String msg = line.asText(""); + int start = msg.indexOf("Program log: SHINE_STARS_V1|"); + if (start < 0) continue; + String payload = msg.substring(start + "Program log: SHINE_STARS_V1|".length()); + counts.merge(payload, 1, Integer::sum); + } + boolean hasStarsEvent = !counts.isEmpty(); List result = new ArrayList<>(); for (int index = 0; index < instructions.size(); index++) { JsonNode instruction = instructions.get(index); @@ -253,7 +279,27 @@ public final class SupportHistoryIndexer { if (encoded.isBlank()) continue; byte[] bytes = Base58Util.decode(encoded); if (bytes.length == 0 || ((bytes[0] & 0xff) != 9 && (bytes[0] & 0xff) != 10)) continue; - result.add(decodeInstruction(bytes, index)); + try { + result.add(decodeInstruction(bytes, index)); + } catch (RuntimeException malformed) { + if (hasStarsEvent) throw malformed; + // Историческая инструкция тестового контракта: количество Stars + // отсутствует, поэтому в новую историю её не включаем. + } + } + // Если новая инструкция была, но событие пропало, НЕ включаем её в историю + // и НЕ продвигаем checkpoint. Это ошибка RPC/индексатора. + if (!result.isEmpty() && !logs.isArray()) throw new IllegalArgumentException("Stars event logs missing"); + for (SupportEvent event : result) { + String payload = event.kind() + "|" + event.sender() + "|" + + (event.recipient() == null ? "-" : event.recipient()) + "|" + + event.amount() + "|" + event.stars() + "|" + event.recipientStars() + "|" + event.daoStars(); + int count = counts.getOrDefault(payload, 0); + if (count == 0) throw new IllegalArgumentException("Missing verified Stars event: " + payload); + counts.put(payload, count - 1); + } + if (counts.values().stream().anyMatch(v -> v != 0)) { + throw new IllegalArgumentException("Unmatched SHINE_STARS_V1 events in transaction"); } return result; } @@ -265,6 +311,8 @@ public final class SupportHistoryIndexer { String sender = readLogin(b); String recipient = ix == 9 ? readLogin(b) : null; BigInteger amount = readUnsigned64(b); + BigInteger stars = readUnsigned64(b); + if (stars.compareTo(BigInteger.TEN) < 0) throw new IllegalArgumentException("Stars minimum 0.10"); if (amount.signum() <= 0) throw new IllegalArgumentException("Invalid amount"); int target = ix == 9 ? (b.get() & 255) : 0; String channelNumber = null, messageNumber = null, channelHash = null, messageHash = null; @@ -277,13 +325,15 @@ public final class SupportHistoryIndexer { byte[] hash = new byte[32]; b.get(hash); messageHash = HexFormat.of().formatHex(hash); } if (target > 2 || b.hasRemaining()) throw new IllegalArgumentException("Malformed support instruction"); - if (ix == 9 && (!amount.mod(BigInteger.TEN).equals(BigInteger.ZERO) || sender.equals(recipient))) { + if (ix == 9 && sender.equals(recipient)) { throw new IllegalArgumentException("Invalid support split or self-support"); } - BigInteger inflow = ix == 9 ? amount.divide(BigInteger.TEN) : amount; + BigInteger inflow = ix == 9 ? amount.add(BigInteger.valueOf(9)).divide(BigInteger.TEN) : amount; + BigInteger daoStars = ix == 9 ? stars.add(BigInteger.valueOf(9)).divide(BigInteger.TEN) : stars; + BigInteger recipientStars = ix == 9 ? stars.subtract(daoStars) : BigInteger.ZERO; BigInteger received = ix == 9 ? amount.subtract(inflow) : BigInteger.ZERO; return new SupportEvent(index, ix == 9 ? "USER" : "DAO", sender, recipient, - amount, received, inflow, target, channelNumber, channelHash, messageNumber, messageHash); + amount, received, inflow, stars, recipientStars, daoStars, target, channelNumber, channelHash, messageNumber, messageHash); } private static String readLogin(ByteBuffer b) { @@ -299,6 +349,7 @@ public final class SupportHistoryIndexer { } public record SupportEvent(int index, String kind, String sender, String recipient, - BigInteger amount, BigInteger recipientAmount, BigInteger inflowAmount, int target, + BigInteger amount, BigInteger recipientAmount, BigInteger inflowAmount, + BigInteger stars, BigInteger recipientStars, BigInteger daoStars, int target, String channelNumber, String channelHash, String messageNumber, String messageHash) {} } diff --git a/SHiNE-server/shine-server-solana-users-sync/src/test/java/sync/codec/ShineUsersCodecStarsTest.java b/SHiNE-server/shine-server-solana-users-sync/src/test/java/sync/codec/ShineUsersCodecStarsTest.java new file mode 100644 index 00000000..4db363fc --- /dev/null +++ b/SHiNE-server/shine-server-solana-users-sync/src/test/java/sync/codec/ShineUsersCodecStarsTest.java @@ -0,0 +1,49 @@ +package sync.codec; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.Test; +import sync.util.Base58Util; +import java.io.ByteArrayOutputStream; +import java.nio.charset.StandardCharsets; +import static org.junit.jupiter.api.Assertions.*; + +class ShineUsersCodecStarsTest { + private static void u64(ByteArrayOutputStream out, long n) { + for (int i = 0; i < 8; i++) out.write((int)(n >>> (8 * i)) & 255); + } + private static void str(ByteArrayOutputStream out, String text) { + byte[] bytes = text.getBytes(StandardCharsets.UTF_8); + out.write(bytes.length); out.writeBytes(bytes); + } + @Test void userSupportReadsAmountStarsThenTarget() { + var out = new ByteArrayOutputStream(); + out.write(9); str(out, "alice@ns"); str(out, "bob@ns"); + u64(out, 5_000_000); u64(out, 75); out.write(2); + u64(out, 10); out.writeBytes(new byte[32]); u64(out, 12); out.writeBytes(new byte[32]); + var instruction = new ObjectMapper().createObjectNode(); + instruction.put("programId", "test_program"); + instruction.put("data", Base58Util.encode(out.toByteArray())); + var parsed = ShineUsersCodec.parseShineUsersInstruction(instruction, "test_program"); + assertNotNull(parsed); + assertEquals(ShineUsersCodec.TxKind.SUPPORT_USER, parsed.kind()); + } + @Test void daoSupportReadsStarsAmount() { + var out = new ByteArrayOutputStream(); + out.write(10); str(out, "alice@ns"); u64(out, 5_000_000); u64(out, 75); + var instruction = new ObjectMapper().createObjectNode(); + instruction.put("programId", "test_program"); + instruction.put("data", Base58Util.encode(out.toByteArray())); + var parsed = ShineUsersCodec.parseShineUsersInstruction(instruction, "test_program"); + assertEquals(ShineUsersCodec.TxKind.SUPPORT_DAO, parsed.kind()); + } + @Test void v1LamportCountersAreNotConvertedToStars() { + byte[] raw = new byte[105]; + raw[7] = 80; raw[80] = 1; raw[81] = 75; + var stats = ShineUsersCodec.parseSupportStats(raw); + assertEquals(2, stats.version()); + assertEquals(0L, stats.supportSent()); + raw[80] = 2; + stats = ShineUsersCodec.parseSupportStats(raw); + assertEquals(75L, stats.supportSent()); + } +} diff --git a/SHiNE-server/shine-server-solana-users-sync/src/test/java/sync/service/SupportHistoryIndexerTest.java b/SHiNE-server/shine-server-solana-users-sync/src/test/java/sync/service/SupportHistoryIndexerTest.java index 2728d89a..e21a64e1 100644 --- a/SHiNE-server/shine-server-solana-users-sync/src/test/java/sync/service/SupportHistoryIndexerTest.java +++ b/SHiNE-server/shine-server-solana-users-sync/src/test/java/sync/service/SupportHistoryIndexerTest.java @@ -2,6 +2,10 @@ package sync.service; import org.junit.jupiter.api.Test; import java.io.ByteArrayOutputStream; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import sync.util.Base58Util; import java.math.BigInteger; import java.nio.charset.StandardCharsets; import java.util.HexFormat; @@ -16,57 +20,92 @@ class SupportHistoryIndexerTest { private static void u64(ByteArrayOutputStream out, long value) { for (int i=0;i<8;i++) out.write((int)(value >>> (8*i)) & 255); } + @Test void confirmedStarsEventIsRequiredAndMatchesAmounts() { + var out = new ByteArrayOutputStream(); + out.write(9); str(out, "alice@ns"); str(out, "bob@ns"); + u64(out, 5000000); u64(out, 75); out.write(0); + var json = new ObjectMapper(); + ObjectNode tx = json.createObjectNode(); + ObjectNode meta = tx.putObject("meta"); + ArrayNode logs = meta.putArray("logMessages"); + ObjectNode instruction = tx.putObject("transaction").putObject("message") + .putArray("instructions").addObject(); + instruction.put("programId", "test_program"); + instruction.put("data", Base58Util.encode(out.toByteArray())); + logs.add("Program log: SHINE_STARS_V1|USER|alice@ns|bob@ns|5000000|75|67|8"); + assertEquals(1, SupportHistoryIndexer.decodeTransaction(tx, "test_program").size()); + logs.removeAll(); + assertThrows(IllegalArgumentException.class, + () -> SupportHistoryIndexer.decodeTransaction(tx, "test_program")); + } + + @Test void legacyDonateWithoutStarsIsNotIndexed() { + var out = new ByteArrayOutputStream(); + out.write(9); str(out, "alice@ns"); str(out, "bob@ns"); + u64(out, 5000000); out.write(0); // old protocol lacked star cents + var json = new ObjectMapper(); + ObjectNode tx = json.createObjectNode(); + tx.putObject("meta").putArray("logMessages").add("Program log: Legacy donation"); + tx.putObject("transaction").putObject("message") + .putArray("instructions").addObject() + .put("programId", "test_program") + .put("data", Base58Util.encode(out.toByteArray())); + assertTrue(SupportHistoryIndexer.decodeTransaction(tx, "test_program").isEmpty()); + } + @Test void userSplitAndMessageHash() { var out = new ByteArrayOutputStream(); - out.write(9); str(out, "alice@namespace"); str(out, "bob@namespace"); u64(out, 1000); + out.write(9); str(out, "alice@namespace"); str(out, "bob@namespace"); u64(out, 1000); u64(out, 75); out.write(2); u64(out, 11); out.writeBytes(new byte[32]); u64(out, 19); byte[] hash = new byte[32]; hash[0] = 42; out.writeBytes(hash); var event = SupportHistoryIndexer.decodeInstruction(out.toByteArray(), 3); assertEquals("1000", event.amount().toString()); assertEquals("900", event.recipientAmount().toString()); assertEquals("100", event.inflowAmount().toString()); + assertEquals("8", event.daoStars().toString()); + assertEquals("67", event.recipientStars().toString()); assertEquals("19", event.messageNumber()); assertEquals(HexFormat.of().formatHex(hash), event.messageHash()); assertEquals(3, event.index()); } @Test void directDaoNoFee() { - var out = new ByteArrayOutputStream(); out.write(10); str(out,"alice@ns"); u64(out, 12345); + var out = new ByteArrayOutputStream(); out.write(10); str(out,"alice@ns"); u64(out, 12345); u64(out, 75); var event = SupportHistoryIndexer.decodeInstruction(out.toByteArray(), 0); assertEquals(BigInteger.valueOf(12345), event.inflowAmount()); assertEquals(BigInteger.ZERO, event.recipientAmount()); assertNull(event.recipient()); } @Test void malformedIsRejected() { - var out = new ByteArrayOutputStream(); out.write(9); str(out,"alice@ns");str(out,"alice@ns");u64(out,100); + var out = new ByteArrayOutputStream(); out.write(9); str(out,"alice@ns");str(out,"alice@ns");u64(out,100);u64(out,75); out.write(0); assertThrows(IllegalArgumentException.class, () -> SupportHistoryIndexer.decodeInstruction(out.toByteArray(),0)); } @Test void unsignedU64Preserved() { - var out = new ByteArrayOutputStream();out.write(10);str(out,"alice@ns");u64(out,-1L); + var out = new ByteArrayOutputStream();out.write(10);str(out,"alice@ns");u64(out,-1L);u64(out,75); assertEquals("18446744073709551615", SupportHistoryIndexer.decodeInstruction(out.toByteArray(),0).amount().toString()); } @Test void userStatsIncrementsUseFullSentAndNetReceived() { var out = new ByteArrayOutputStream(); - out.write(9); str(out, "Alice@NS"); str(out, "Bob@NS"); u64(out, 1000); out.write(0); + out.write(9); str(out, "Alice@NS"); str(out, "Bob@NS"); u64(out, 1000); u64(out, 75); out.write(0); var event = SupportHistoryIndexer.decodeInstruction(out.toByteArray(), 1); var deltas = SupportHistoryIndexer.userStatsIncrements(event); assertEquals(2, deltas.size()); assertEquals("Alice@NS", deltas.get(0).login()); - assertEquals(BigInteger.valueOf(1000), deltas.get(0).sent()); + assertEquals(BigInteger.valueOf(75), deltas.get(0).sent()); assertEquals(BigInteger.ZERO, deltas.get(0).received()); assertEquals("Bob@NS", deltas.get(1).login()); - assertEquals(BigInteger.valueOf(900), deltas.get(1).received()); + assertEquals(BigInteger.valueOf(67), deltas.get(1).received()); assertEquals(BigInteger.ZERO, deltas.get(1).direct()); } @Test void daoIncrementsOnlyDirectCounter() { var out = new ByteArrayOutputStream(); - out.write(10); str(out, "Alice@NS"); u64(out, 500); + out.write(10); str(out, "Alice@NS"); u64(out, 500); u64(out, 75); var deltas = SupportHistoryIndexer.userStatsIncrements( SupportHistoryIndexer.decodeInstruction(out.toByteArray(), 0)); assertEquals(1, deltas.size()); assertEquals(BigInteger.ZERO, deltas.get(0).sent()); assertEquals(BigInteger.ZERO, deltas.get(0).received()); - assertEquals(BigInteger.valueOf(500), deltas.get(0).direct()); + assertEquals(BigInteger.valueOf(75), deltas.get(0).direct()); } } diff --git a/VERSION.properties b/VERSION.properties index 0307d82c..24a555f2 100644 --- a/VERSION.properties +++ b/VERSION.properties @@ -1,2 +1,2 @@ -client.version=1.20.38 -server.version=1.16.21 +client.version=1.20.39 +server.version=1.16.22 diff --git a/deploy/SOLANA_USERS_SYNC_SERVER_SETUP.md b/deploy/SOLANA_USERS_SYNC_SERVER_SETUP.md index 79abae9b..1428bfb7 100644 --- a/deploy/SOLANA_USERS_SYNC_SERVER_SETUP.md +++ b/deploy/SOLANA_USERS_SYNC_SERVER_SETUP.md @@ -177,8 +177,8 @@ SELECT schema_version FROM db_schema_version WHERE id=1; Новых настроек и отдельных сервисов нет. При `solana.users.sync.enabled=true` существующий `SupportHistoryIndexer` использует прежнее Solana RPC/Helius и PostgreSQL подключение. При первом запуске обновлённой версии автоматически -создаёт таблицу `solana_support_user_stats` и пересчитывает прошлые донаты из -`solana_support_transfers`. После этого новые финализированные переводы +создаёт таблицу `solana_support_user_stats` и пересчитывает только Stars-переводы +из `solana_support_transfers`. История legacy SOL не импортируется. После этого новые финализированные переводы увеличивают готовые счётчики инкрементально. При первом восстановлении с нуля `GetSupportStats` возвращает `ready=false` до конца сканирования. @@ -195,3 +195,18 @@ FROM solana_support_user_stats ORDER BY support_received DESC LIMIT 20; В случае подозрения на рассогласование кеша остановить синхронизатор, выполнить `UPDATE solana_support_sync_state SET stats_cache_ready=FALSE WHERE id=1` и вновь запустить. Журнал финансовых операций при этом сохраняется. + + +### Stars v1.2 на тестовом Devnet (14.11.2026) + +Котировку получает браузер через SHiNE Solana RPC (`getMultipleAccounts`), серверные переменные оракула не требуются. +Stars v1.2: сервер НЕ рассчитывает курс. Клиент через авторизованный Solana RPC +читает Pyth PriceUpdateV2 напрямую, а контракт сам проверяет котировку. +Серверу не нужны `PYTH_API_KEY`, `SHINE_PYTH_SOL_ACCOUNT`, `SHINE_PYTH_USDT_ACCOUNT`. +Devnet: оба PDA feed-аккаунта должны содержать свежую цену, иначе донаты +корректно отклоняются до подписи. См. `STARS_PATCH_README.md`. + +Для чистого старта на тестовой БД при остановленном сервере/индексаторе: +`psql ... -f docs/STARS_V1_TEST_RESET.sql`. Не выполнять на production. +Нужно обновить программу `shine_users`, синхронизатор, сервер и UI на один +и тот же protocol Stars; затем проверить 0,10/0,75/10,00 ⭐ в Devnet. diff --git a/docs/API/06_Channels_Read_API.md b/docs/API/06_Channels_Read_API.md index 10ff4b75..fa6872ec 100644 --- a/docs/API/06_Channels_Read_API.md +++ b/docs/API/06_Channels_Read_API.md @@ -654,7 +654,7 @@ Changing `account_role` or `shine` does not alter the raw reaction. The two qual Запрос: `{"op":"GetSupportTotals", "channelRootBlockNumber":12, "channelRootBlockHash":"<64 hex>"}`. -Ответ (при `status=200`): `channelReceivedLamports` — десятичная строка суммы реально полученных авторами средств (90% донатов); `messages` — массив `{blockNumber,blockHash,receivedLamports}`. Все значения в lamports представлены **строками**, не JavaScript Number. В результате возвращаются не более 2000 сообщений с максимальными суммами, агрегат канала включает все проверенные операции. +Ответ (при `status=200`): `channelReceivedStarCents` — десятичная строка стоимости поддержки, полученной авторами в сотых долях ⭐ после комиссии DAO; `messages` — массив `{blockNumber,blockHash,receivedStarCents}`. Все денежные значения представлены **строками**, не JavaScript Number. В результате возвращаются не более 2000 сообщений с максимальными суммами, агрегат канала включает все проверенные операции. API считает только `support_user` из таблицы `solana_support_transfers`. Для CHANNEL проверяет, что адресат равен владельцу существующего канала. Для MESSAGE проверяет наличие блока с точным номером/хешем, авторство получателя и принадлежность блока цепочке владельца канала. Не соответствующие этим условиям донаты остаются в истории, но не включаются в публичные суммы. Поддержка ответов в других пользовательских цепочках не попадает в агрегат до добавления полной проверки принадлежности обсуждению. @@ -681,9 +681,9 @@ API считает только `support_user` из таблицы `solana_suppo "op":"GetSupportStats", "requestId":"support-1", "status":200, "ok":true, "payload":{ "login":"Alice@namespace", "available":true, "ready":true, - "supportSentLamports":"1000000000", - "supportReceivedLamports":"900000000", - "daoDirectLamports":"100000000" + "supportSentStarCents":"1000", + "supportReceivedStarCents":"900", + "daoDirectStarCents":"100" } } ``` @@ -694,10 +694,37 @@ API считает только `support_user` из таблицы `solana_suppo суммы **нельзя** показывать как окончательные (даже если возвращены нули). - `available=true, ready=true`, а строки сумм равны `"0"` — корректная нулевая статистика зарегистрированного Paid-пользователя без донатов. -- Все значения lamports передаются **строками** (без преобразования в JS Number). - Показатель «Поддержал SHiNE» вычисляется как `supportSentLamports / 10 + - daoDirectLamports`. Регистрация и изменение PDA сюда не входят. +- Все значения Stars — **целые сотые доли**, сериализованные строками. + `supportSentStarCents` — пожертвования авторам до доли DAO; + `supportReceivedStarCents` — полученная авторами сумма после доли DAO; + `daoDirectStarCents` — прямые пожертвования проекту. Доля DAO от поддержки + авторам учитывается в каждой транзакции, но не суммируется в `daoDirect`. + Регистрация и изменение PDA сюда не входят. При отсутствии таблиц/соединения БД сервер возвращает ошибку, а не фиктивные нули. API не запускает RPC-вызовы; для свежих значений сразу после оплаты необходимо дождаться следующего прохода `SupportHistoryIndexer`. + + +## Stars / Pyth — расчёт непосредственно в браузере + +Серверная операция `GetStarsQuote` удалена в Stars v1.2. +Клиент использует `getStarsQuoteFromRpc` и свой Solana RPC `state.entrySettings.solanaServer`. +Из PDA Pyth Core (shard 0) читаются цены SOL/USD и USDT/USD одним запросом +`getMultipleAccountsInfo`; на клиенте проверяются owner, discriminator, +Full verification, feed ID, свежесть до 120 сек. и confidence <=1%. +Платёж отправляется только после получения свежей котировки. +Смарт-контракт выполняет свою независимую проверку. + + +## GetSupportHistory — история пожертвований Stars + +Публичный запрос: `{"op":"GetSupportHistory","requestId":"h-1","payload":{"login":"Alice@namespace","limit":20,"offset":0}}`. +`limit=1..50`, `offset=0..10000`. Ответ: `ready`, `hasMore`, массив `transfers`. +Каждый элемент включает `signature`, `instructionIndex`, `slot`, `blockTime`, +`senderLogin`, `recipientLogin`, `kind`, `amountLamports`, `amountStarCents`, +`recipientStarCents`, `daoStarCents`, `targetType`, идентификаторы канала/публикации. +Денежные суммы — десятичные **строки целых единиц**, без float. При +`ready=false` история ещё индексируется и не должна считаться полной. +Данные берутся только из успешных финализированных транзакций с событиями +`SHINE_STARS_V1`; старые тестовые донаты игнорируются. diff --git a/docs/API/09_Operations_Index.md b/docs/API/09_Operations_Index.md index 48f5751a..54d66892 100644 --- a/docs/API/09_Operations_Index.md +++ b/docs/API/09_Operations_Index.md @@ -69,7 +69,8 @@ | `GetMessageThread` | `06_Channels_Read_API.md` | тред сообщения | | `GetMessageLikes` | `06_Channels_Read_API.md` | списки пользователей, поставивших лайк сообщению | | `GetSupportTotals` | `06_Channels_Read_API.md` | подтверждённые суммы поддержки канала и публикаций | -| `GetSupportStats` | `06_Channels_Read_API.md` | три кешированных счётчика поддержки Paid-пользователя | +| `GetSupportStats` | `06_Channels_Read_API.md` | три кешированных счётчика поддержки Paid-пользователя в Stars | +| `GetSupportHistory` | `06_Channels_Read_API.md` | постраничная история финализированных донатов (Stars и SOL) | | `GetPersonalDiary` | `06_Channels_Read_API.md` | виртуальный канал `Личный дневник` из STATUS_ACTION | | `ListUserProfileChannels` | `06_Channels_Read_API.md` | публичные каналы профиля | | `ListUserProfileRelations` | `11_Connections_API.md` | связи пользователя в профиле | diff --git a/docs/STARS_V1_TEST_RESET.sql b/docs/STARS_V1_TEST_RESET.sql new file mode 100644 index 00000000..79561760 --- /dev/null +++ b/docs/STARS_V1_TEST_RESET.sql @@ -0,0 +1,7 @@ +-- ONLY FOR TEST SERVER. Discard OLD support history, no backfill. +DROP VIEW IF EXISTS solana_support_message_totals CASCADE; +DROP VIEW IF EXISTS solana_support_channel_totals CASCADE; +DROP TABLE IF EXISTS solana_support_transfers CASCADE; +DROP TABLE IF EXISTS solana_support_user_stats CASCADE; +DROP TABLE IF EXISTS solana_support_sync_state CASCADE; +-- restart shine-server-solana-users-sync to recreate Stars-only schema. diff --git a/docs/Solana/SOLANA_USERS_SYNC_MODULE_DESIGN.md b/docs/Solana/SOLANA_USERS_SYNC_MODULE_DESIGN.md index 4e6be7dd..7357a919 100644 --- a/docs/Solana/SOLANA_USERS_SYNC_MODULE_DESIGN.md +++ b/docs/Solana/SOLANA_USERS_SYNC_MODULE_DESIGN.md @@ -649,30 +649,29 @@ Instruction `shine_users` opcode 8 (`update_namespace_price`) передаёт e `SupportHistoryIndexer` работает внутри цикла `SolanaUsersSyncService` и имеет **отдельный checkpoint** `solana_support_sync_state`. Это важно: основной user-PDA синхронизатор при первом запуске использует snapshot и может не воспроизводить старые транзакции. -Индексатор опрашивает `getSignaturesForAddress(shine_users_economy_config)` на **finalized** RPC (рекомендуется архивный Helius endpoint), при первом запуске читает все доступные подписи до начала истории, затем обрабатывает от старых к новым. Для успешных транзакций считывает `getTransaction(jsonParsed)` и все инструкции `shine_users.support_user` (tag 9) и `shine_users.support_dao` (tag 10). Учитывает несколько инструкций в одной транзакции. Суммы сохраняются в PostgreSQL `NUMERIC(20,0)`, поскольку Solana `u64` может превышать Java `long`. +Индексатор опрашивает `getSignaturesForAddress(shine_users_economy_config)` на **finalized** RPC (рекомендуется архивный Helius endpoint), при первом запуске читает все доступные подписи до начала истории, затем обрабатывает от старых к новым. Для успешных транзакций считывает `getTransaction(jsonParsed)` и инструкции `shine_users.support_user` (tag 9) и `shine_users.support_dao` (tag 10) версии Stars с обязательным `amount_star_cents`; события `SHINE_STARS_V1` сверяются по полям и количеству. Старые тестовые инструкции без Stars пропускаются (без миграции). Учитывает несколько инструкций в одной транзакции. Суммы сохраняются в PostgreSQL `NUMERIC(20,0)`, поскольку Solana `u64` может превышать Java `long`. Таблицы: `solana_support_sync_state`, `solana_support_transfers`, `solana_support_user_stats`; представления: `solana_support_channel_totals`, `solana_support_message_totals`. В SQL-представлениях суммы **без проверки авторства**: нельзя публично показывать их напрямую! Для API `GetSupportTotals` добавлена проверка через таблицы `channel_names_state` и `blocks`. Профили получают три кешированных счётчика через `GetSupportStats` (PostgreSQL), не делая Solana RPC при каждом просмотре. Checkpoint обновляется в той же PostgreSQL-транзакции, что и запись всех донатов из Solana-транзакции. Повторный запуск продолжает с последней успешно обработанной подписи. При недоступной исторической транзакции или исчезнувшей checkpoint-подписи синхронизация **останавливается с ошибкой**, а не перескакивает вперёд; требуется RPC с полной историей. Наличие `getSignaturesForAddress` само по себе НЕ гарантирует архивную полноту Helius/RPC. Начальные транзакции должны быть доступны провайдеру. -Индексатор включается вместе с `solana.users.sync.enabled=true`, использует те же PostgreSQL credentials и RPC URL. Реальный прогон полной архивной истории, тестирование с живым Helius и публичный API проверенных агрегатов требуют отдельной интеграционной проверки перед production. +Индексатор включается вместе с `solana.users.sync.enabled=true`, использует те же PostgreSQL credentials и RPC URL. Новый `GetSupportHistory` показывает финализированные переводы из этой таблицы с пагинацией и `ready`-состоянием. Реальный прогон полной архивной истории, тестирование с живым Helius и публичный API проверенных агрегатов требуют отдельной интеграционной проверки перед production. ### Кеш пользовательских счётчиков поддержки (12.11.2026) `solana_support_user_stats` хранит `normalized_login` и три поля `NUMERIC(20,0)`: `support_sent`, `support_received`, `dao_direct`. -При первом запуске обновлённого индексатора существующий `solana_support_transfers` -**однократно** агрегируется в кеш: это позволяет обновить сервер без сброса -накопленной истории. Флаг `stats_cache_ready` в `solana_support_sync_state` +При чистом запуске тестового сервера существующая история SOL не импортируется. +В новый кеш агрегируются исключительно транзакции со стоимостью Stars в центах. Флаг `stats_cache_ready` в `solana_support_sync_state` предотвращает повторный полный подсчёт при каждом запуске. Далее каждая новая уникальная инструкция записывается в журнал и увеличивает счётчики соответствующих пользователей **в одной PostgreSQL-транзакции с checkpoint**. Повторная инструкция с теми же `(signature, instruction_index)` не увеличивает кеш. Для `support_user`: отправителю прибавляется вся сумма, -получателю — 90%. Для `support_dao`: отправителю прибавляется вся сумма в +получателю — сумма Stars после округления 10% DAO вверх до сотой. Для `support_dao`: отправителю прибавляется вся сумма в `dao_direct`. Первая история может занимать время; флаг `history_complete` становится TRUE только после успешного полного прохода. API `GetSupportStats` при FALSE возвращает `ready=false`, чтобы не показывать неполные суммы. diff --git a/scripts/check_stars_pyth_rpc.mjs b/scripts/check_stars_pyth_rpc.mjs new file mode 100644 index 00000000..665ea983 --- /dev/null +++ b/scripts/check_stars_pyth_rpc.mjs @@ -0,0 +1,38 @@ +#!/usr/bin/env node +/** One-shot, zero-dependency diagnostic for the configured SHiNE Solana JSON-RPC. */ +import { parseVerifiedPythPriceAccount, PYTH_SOL_USD_FEED_ID, PYTH_USDT_USD_FEED_ID, PYTH_RECEIVER_PROGRAM_ID } from '../shine-UI/js/services/shine-stars-pyth.js'; +const endpoint = process.argv[2] || process.env.SHINE_SOLANA_RPC_URL; +if (!endpoint || !/^https?:\/\//.test(endpoint)) { + console.error('Usage: node scripts/check_stars_pyth_rpc.mjs https://your-server/solana-rpc'); + process.exit(2); +} +const addresses = [ + '7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE', + 'HT2PLQBcG5EiCcNSaMHAjSgd9F98ecpATbk4Sk5oYuM', +]; +try { + const response = await fetch(endpoint, { + method: 'POST', headers: {'Content-Type':'application/json'}, + body: JSON.stringify({jsonrpc:'2.0', id:1, method:'getMultipleAccounts', params:[addresses, {commitment:'confirmed', encoding:'base64'}]}), + signal: AbortSignal.timeout(20000), + }); + if (!response.ok) throw new Error(`RPC HTTP ${response.status}`); + const payload = await response.json(); + if (payload.error) throw new Error(`RPC error: ${JSON.stringify(payload.error)}`); + const infos = payload.result?.value; + if (!Array.isArray(infos) || infos.length !== 2) throw new Error('RPC returned invalid accounts payload'); + for (let i = 0; i < infos.length; i++) { + const row = infos[i]; + const name = i === 0 ? 'SOL/USD' : 'USDT/USD'; + if (!row) throw new Error(`${name}: Pyth shard-0 account does not exist in this network`); + const account = {data: Uint8Array.from(Buffer.from(row.data?.[0] || '', 'base64')), + owner: {toBase58: () => row.owner}}; + const price = parseVerifiedPythPriceAccount(account, i === 0 ? PYTH_SOL_USD_FEED_ID : PYTH_USDT_USD_FEED_ID); + console.log(`${name}: verified, priceE8=${price.priceE8}, publish_time=${new Date(price.publishTimeSeconds*1000).toISOString()}, account=${addresses[i]}`); + } + console.log('OK: both Pyth accounts are current, can construct Stars quote.'); +} catch (error) { + console.error('FAIL:', error.message); + console.error('The app intentionally blocks donations until both feeds are fresh.'); + process.exitCode = 1; +} diff --git a/scripts/stars_v1_2_remove_obsolete_quote.sh b/scripts/stars_v1_2_remove_obsolete_quote.sh new file mode 100755 index 00000000..cd1369d0 --- /dev/null +++ b/scripts/stars_v1_2_remove_obsolete_quote.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +set -euo pipefail +# Optional cleanup if you previously applied Stars v1.1; no other files are removed. +base="SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels" +if [[ ! -d "$base" ]]; then echo 'Run from SHiNE project root' >&2; exit 1; fi +rm -f "$base/Net_GetStarsQuote_Handler.java" \ + "$base/entyties/Net_GetStarsQuote_Request.java" \ + "$base/entyties/Net_GetStarsQuote_Response.java" +echo 'Obsolete GetStarsQuote Java classes removed (or already absent).' diff --git a/shine-UI/js/components/shine-support-dialog.js b/shine-UI/js/components/shine-support-dialog.js index ee39331a..8d80b384 100644 --- a/shine-UI/js/components/shine-support-dialog.js +++ b/shine-UI/js/components/shine-support-dialog.js @@ -4,8 +4,9 @@ import { readShineUserPda, supportShineUserOnSolana, supportShineDaoOnSolana } f import { loadEncryptedUserSecrets } from '../services/key-vault.js'; import { getWalletFromStoredBlockchainKey, transferSolLamports, solanaAddressFromPublicKeyBase64 } from '../services/solana-wallet-service.js'; import { bytesToBase58 } from '../services/crypto-utils.js'; -import { parseSolLamports, formatLamportsSol } from '../services/shine-support-amount.js'; +import { parseStarCents, formatStars, splitStarCents, starCentsToLamports, formatLamportsSol } from '../services/shine-support-amount.js'; import { toUserMessage } from '../services/ui-error-texts.js'; +import { getStarsQuoteFromRpc } from '../services/shine-stars-pyth.js'; /** One shared payment dialog for profiles, posts and donations to the SHiNE economy. */ export function openShineSupportDialog({ recipientLogin = '', target = { type: 0 }, onSuccess = () => {} } = {}) { @@ -33,7 +34,7 @@ export function openShineSupportDialog({ recipientLogin = '', target = { type: 0 input.type = 'text'; input.inputMode = 'decimal'; input.autocomplete = 'off'; - input.placeholder = '0.01'; + input.placeholder = '0.10'; const details = document.createElement('p'); details.className = 'meta-muted'; const status = document.createElement('p'); @@ -52,38 +53,45 @@ export function openShineSupportDialog({ recipientLogin = '', target = { type: 0 cancel.className = 'text-btn'; cancel.textContent = t('screens.support_phase2.close'); panel.append(header, description, amountLabel, input, details, status, donate); - if (!dao) panel.append(direct); + // Direct transfers bypass Stars accounting and must not appear in the support dialog. panel.append(cancel); overlay.append(panel); document.body.append(overlay); + let quote = null; let busy = false; let closed = false; const close = () => { if (busy) return; closed = true; overlay.remove(); }; cancel.addEventListener('click', close); overlay.addEventListener('click', (event) => { if (event.target === overlay) close(); }); const update = () => { - if (dao) { details.textContent = t('screens.support_phase2.dao_info'); return; } try { - const amount = parseSolLamports(input.value); - details.textContent = amount % 10n === 0n - ? `${t('screens.support_phase2.recipient')}: ${formatLamportsSol(amount * 9n / 10n)} SOL · ${t('screens.support_phase2.fund')}: ${formatLamportsSol(amount / 10n)} SOL` - : t('screens.support_phase2.divisible'); - } catch { details.textContent = t('screens.support_phase2.explanation'); } + const cents = parseStarCents(input.value); + const split = splitStarCents(cents); + const sol = quote ? ` · ≈ ${formatLamportsSol(starCentsToLamports(cents, quote.solUsdE8, quote.usdtUsdE8))} SOL` : ''; + details.textContent = dao ? `${formatStars(cents)}${sol}` : + `${t('screens.support_phase2.recipient')}: ${formatStars(split.author)} · ${t('screens.support_phase2.fund')}: ${formatStars(split.dao)}${sol}`; + } catch { details.textContent = 'Минимум 0,10 ⭐'; } }; input.addEventListener('input', update); + amountLabel.textContent = 'Сумма поддержки, ⭐'; update(); + void getStarsQuoteFromRpc({ solanaEndpoint: state.entrySettings.solanaServer }).then((value) => { quote = value; if (!closed) update(); }) + .catch(() => { if (!closed) details.textContent = 'Курс недоступен. Повторите попытку позднее.'; }); const send = async (isDirect) => { if (busy || closed) return; - let amount; + let amount, cents; try { - amount = parseSolLamports(input.value); - if (!dao && !isDirect && amount % 10n !== 0n) throw new Error(t('screens.support_phase2.divisible')); + cents = parseStarCents(input.value); + if (isDirect) throw new Error('Прямой перевод не учитывается в Stars'); } catch (error) { status.textContent = error.message; return; } if (isDirect && !window.confirm(t('screens.support_phase2.direct_warning'))) return; busy = true; donate.disabled = direct.disabled = cancel.disabled = input.disabled = true; status.textContent = t('screens.support_phase2.sending'); try { + // Fetch a fresh quote immediately before signing; Pyth on-chain check is authoritative. + quote = await getStarsQuoteFromRpc({ solanaEndpoint: state.entrySettings.solanaServer }); + amount = starCentsToLamports(cents, quote.solUsdE8, quote.usdtUsdE8); const { storagePwdInMemory: password } = state.session; const endpoint = state.entrySettings.solanaServer; let result; @@ -102,7 +110,9 @@ export function openShineSupportDialog({ recipientLogin = '', target = { type: 0 } else { const secrets = await loadEncryptedUserSecrets(login, password); if (!secrets?.blockchainKey || !secrets?.clientKey) throw new Error(t('screens.support_phase2.keys_required')); - const args = { senderLogin: login, amountLamports: amount, solanaEndpoint: endpoint, blockchainPrivatePkcs8B64: secrets.blockchainKey, clientPrivatePkcs8B64: secrets.clientKey }; + const args = { senderLogin: login, amountLamports: amount, starCents: cents, + oracleAccounts: { solUsd: quote.solOracleAccount, usdtUsd: quote.usdtOracleAccount }, + solanaEndpoint: endpoint, blockchainPrivatePkcs8B64: secrets.blockchainKey, clientPrivatePkcs8B64: secrets.clientKey }; result = dao ? await supportShineDaoOnSolana(args) : await supportShineUserOnSolana({ ...args, recipientLogin, target }); } status.textContent = `${t('screens.support_phase2.success')} ${result.signature || ''}`; diff --git a/shine-UI/js/components/support-stats.js b/shine-UI/js/components/support-stats.js index d6dd344c..e32bac90 100644 --- a/shine-UI/js/components/support-stats.js +++ b/shine-UI/js/components/support-stats.js @@ -1,12 +1,13 @@ import { t } from '../i18n/index.js'; import { authService } from '../state.js'; -import { formatLamportsSol } from '../services/shine-support-amount.js'; +import { getSolanaCluster } from '../services/solana-rpc-gateway.js'; +import { formatStars } from '../services/shine-support-amount.js'; export function supportStatsValues(stats = {}) { const sent = BigInt(stats.supportSent ?? 0); const received = BigInt(stats.supportReceived ?? 0); const daoDirect = BigInt(stats.daoDirect ?? 0); - return [sent, received, sent / 10n + daoDirect]; + return [sent, received, daoDirect]; } /** Adds an independent asynchronous block; failure/Free accounts do not get fictitious statistics. */ @@ -20,7 +21,87 @@ export function attachSupportStats(parent, { login, isActive = () => true }) { content.className = 'meta-muted'; content.textContent = t('screens.support_phase2.loading'); section.append(title, content); + const history = document.createElement('details'); + history.className = 'profile-support-history'; + const historySummary = document.createElement('summary'); + historySummary.textContent = t('screens.support_phase2.history'); + const historyRows = document.createElement('div'); + historyRows.className = 'stack'; + historyRows.style.cssText = 'gap:8px;margin-top:10px;'; + history.append(historySummary, historyRows); + section.append(history); parent.append(section); + let historyOffset = 0; + let loadingHistory = false; + let historyLoaded = false; + const historyLogin = String(login || '').trim().toLowerCase(); + const loadHistory = async () => { + if (loadingHistory || !isActive() || !section.isConnected) return; + loadingHistory = true; + const note = document.createElement('div'); + note.className = 'meta-muted'; + note.textContent = t('screens.support_phase2.loading'); + historyRows.append(note); + try { + const result = await authService.getSupportHistory(login, 20, historyOffset); + if (!isActive() || !section.isConnected) return; + note.remove(); + if (!result.ready) { + historyRows.textContent = t('screens.support_phase2.loading'); + return; + } + if (!historyOffset && !result.transfers?.length) { + historyRows.textContent = t('screens.support_phase2.no_history'); + } + const more = historyRows.querySelector('[data-stars-more]'); + more?.remove(); + for (const transfer of result.transfers || []) { + const outgoing = transfer.senderLogin?.trim().toLowerCase() === historyLogin; + const cents = transfer.kind === 'DAO' || outgoing + ? transfer.amountStarCents : transfer.recipientStarCents; + const row = document.createElement('div'); + row.className = 'row'; + row.style.cssText = 'display:flex;flex-wrap:wrap;align-items:center;justify-content:space-between;gap:6px;'; + const info = document.createElement('span'); + info.textContent = transfer.kind === 'DAO' + ? t('screens.support_phase2.history_dao') + : `${outgoing ? '→' : '←'} ${outgoing ? transfer.recipientLogin : transfer.senderLogin}`; + const value = document.createElement('strong'); + value.textContent = `${outgoing ? '−' : '+'}${formatStars(cents)}`; + const detail = document.createElement('small'); + detail.className = 'meta-muted'; + const date = transfer.blockTime ? new Date(Number(transfer.blockTime) * 1000).toLocaleString() : ''; + const lamports = BigInt(transfer.amountLamports || '0'); + const sol = `${lamports / 1_000_000_000n}.${String(lamports % 1_000_000_000n).padStart(9, '0').replace(/0+$/, '') || '0'} SOL`; + detail.textContent = `${date} · ${sol}`; + const explorer = document.createElement('a'); + const sig = String(transfer.signature || ''); + if (/^[1-9A-HJ-NP-Za-km-z]{64,90}$/.test(sig)) { + const network = getSolanaCluster(); + explorer.href = `https://explorer.solana.com/tx/${sig}${network && network !== 'mainnet-beta' ? `?cluster=${encodeURIComponent(network)}` : ''}`; + explorer.target = '_blank'; explorer.rel = 'noopener noreferrer'; + explorer.textContent = t('screens.support_phase2.transaction'); + row.append(info, value, detail, explorer); + } else row.append(info, value, detail); + historyRows.append(row); + } + historyOffset += (result.transfers || []).length; + if (result.hasMore) { + const btn = document.createElement('button'); + btn.className = 'text-btn'; btn.type = 'button'; + btn.dataset.starsMore = '1'; + btn.textContent = t('screens.support_phase2.more'); + btn.addEventListener('click', () => void loadHistory()); + historyRows.append(btn); + } + historyLoaded = true; + } catch { + if (isActive() && section.isConnected) note.textContent = t('screens.support_phase2.history_unavailable'); + } finally { loadingHistory = false; } + }; + history.addEventListener('toggle', () => { + if (history.open && !historyLoaded) void loadHistory(); + }); let pendingRefresh = null; const scheduleRetry = () => { if (pendingRefresh !== null) return; @@ -45,9 +126,9 @@ export function attachSupportStats(parent, { login, isActive = () => true }) { return; } const values = supportStatsValues({ - supportSent: stats.supportSentLamports, - supportReceived: stats.supportReceivedLamports, - daoDirect: stats.daoDirectLamports, + supportSent: stats.supportSentStarCents, + supportReceived: stats.supportReceivedStarCents, + daoDirect: stats.daoDirectStarCents, }); content.replaceChildren(); content.className = 'stack'; @@ -58,7 +139,7 @@ export function attachSupportStats(parent, { login, isActive = () => true }) { const name = document.createElement('span'); const amount = document.createElement('strong'); name.textContent = label; - amount.textContent = `${formatLamportsSol(values[idx])} SOL`; + amount.textContent = formatStars(values[idx]); row.append(name, amount); content.append(row); }); diff --git a/shine-UI/js/i18n/locales/en.json b/shine-UI/js/i18n/locales/en.json index 8471c88d..3fa43216 100644 --- a/shine-UI/js/i18n/locales/en.json +++ b/shine-UI/js/i18n/locales/en.json @@ -2216,15 +2216,15 @@ }, "chat_view": { "security_notice": { - "title": "Your conversation is protected by end-to-end encryption", - "encryption": "All private messages are encrypted using modern cryptographic algorithms. Encryption keys are stored ONLY on the participants’ devices.", - "servers": "SHiNE servers do not possess your private keys and cannot technically read your messages.", - "derivation": "Your encryption key is derived from your login and password.", - "rotation": "When you change your password, your messages are re-encrypted from the old password to the new one on your device.", - "source": "The source code of our applications is fully open, so you can verify these claims yourself.", + "title": "Private chat security", + "encryption": "Messages in this chat are encrypted on the participants' devices.", + "servers": "The server delivers encrypted data but should not be able to read the conversation.", + "derivation": "Chat keys are derived from account keys and stored on the devices.", + "rotation": "After key rotation, some messages may require the keys to be received again.", + "source": "Before sending, make sure you are communicating with the intended user and server.", "warning_label": "Important:", - "warning": "if you forget your password, you will not be able to recover access to your encrypted conversations.", - "recovery": "SHiNE does not store your secret keys and cannot help you restore your conversations." + "warning": "never share private keys or your account password with anyone.", + "recovery": "Access recovery depends on your saved keys and password. Keep them secure." }, "text_002": "Muted", "text_015": "Search", @@ -4246,7 +4246,7 @@ "donate_shine": "✨ Support SHiNE", "donate": "Donate", "to": "Recipient:", - "amount": "Amount, SOL", + "amount": "Amount, ⭐", "recipient": "Recipient", "fund": "SHiNE economy", "dao_info": "100% of your donation goes to the SHiNE economic fund and participates in its existing payout system.", @@ -4261,7 +4261,13 @@ "success": "Transfer confirmed:", "failed": "Transfer failed", "close": "Close", - "invalid_target": "This post has no verified block number or hash" + "invalid_target": "This post has no verified block number or hash", + "history": "Transfer history", + "no_history": "No transfers yet", + "history_dao": "→ SHiNE fund", + "transaction": "Transaction ↗", + "more": "Show more", + "history_unavailable": "Could not load transfer history" }, "support_phase3": { "channel_total": "Channel support received" diff --git a/shine-UI/js/i18n/locales/ru.json b/shine-UI/js/i18n/locales/ru.json index fae2f497..c68eafb3 100644 --- a/shine-UI/js/i18n/locales/ru.json +++ b/shine-UI/js/i18n/locales/ru.json @@ -2349,15 +2349,15 @@ }, "chat_view": { "security_notice": { - "title": "Ваша переписка защищена сквозным шифрованием", - "encryption": "Все личные сообщения шифруются с использованием современных криптографических алгоритмов. Ключи шифрования хранятся ТОЛЬКО на устройствах участников переписки.", - "servers": "Сервера SHiNE не имеют ваших приватных ключей и даже технически никак не могут прочитать ваши сообщения.", - "derivation": "Ваш ключ шифрования высчитывается из вашего логина и пароля.", - "rotation": "При смене пароля перекодирование всех ваших сообщений со старого пароля на новый происходит на устройстве пользователя.", - "source": "Код наших приложений полностью открыт и вы легко можете проверить всё это сами.", + "title": "Безопасность личной переписки", + "encryption": "Сообщения в этом чате шифруются на устройствах участников.", + "servers": "Сервер доставляет зашифрованные данные, но не должен видеть содержимое переписки.", + "derivation": "Ключи переписки производятся из ключей аккаунта и хранятся на устройствах.", + "rotation": "При смене ключей часть сообщений может потребовать повторного получения ключей.", + "source": "Перед отправкой проверьте, что вы общаетесь с нужным пользователем и сервером.", "warning_label": "Важно:", - "warning": "если вы забудете свой пароль, восстановить доступ к вашей зашифрованной переписке будет невозможно.", - "recovery": "SHiNE не хранит ваши секретные ключи и никак не сможет помочь вам восстановить вашу переписку." + "warning": "не передавайте приватные ключи и пароль аккаунта другим людям.", + "recovery": "Восстановление доступа зависит от сохранённых ключей и пароля. Храните их безопасно." }, "text_001": "Чат", "text_002": "Без звука", @@ -4246,7 +4246,7 @@ "donate_shine": "✨ Поддержать SHiNE", "donate": "Пожертвовать", "to": "Получатель:", - "amount": "Сумма, SOL", + "amount": "Сумма, ⭐", "recipient": "Получателю", "fund": "Экономике SHiNE", "dao_info": "100% пожертвования поступает в экономический фонд SHiNE и участвует в действующей системе выплат.", @@ -4261,7 +4261,13 @@ "success": "Перевод подтверждён:", "failed": "Не удалось отправить перевод", "close": "Закрыть", - "invalid_target": "Для этой публикации отсутствует проверенный номер или хеш блока" + "invalid_target": "Для этой публикации отсутствует проверенный номер или хеш блока", + "history": "История переводов", + "no_history": "Переводов пока нет", + "history_dao": "→ Фонд SHiNE", + "transaction": "Транзакция ↗", + "more": "Показать ещё", + "history_unavailable": "Не удалось загрузить историю" }, "support_phase3": { "channel_total": "Канал получил поддержку" diff --git a/shine-UI/js/pages/channel-donate-view.js b/shine-UI/js/pages/channel-donate-view.js index 6b24c017..ffbcae85 100644 --- a/shine-UI/js/pages/channel-donate-view.js +++ b/shine-UI/js/pages/channel-donate-view.js @@ -15,9 +15,10 @@ import { toUserMessage } from '../services/ui-error-texts.js'; import { bytesToBase58 } from '../services/crypto-utils.js'; import { loadEncryptedUserSecrets } from '../services/key-vault.js'; import { readShineUserPda, supportShineUserOnSolana } from '../services/shine-user-pda-service.js'; -import { parseSolLamports, formatLamportsSol, hexHash32 } from '../services/shine-support-amount.js'; +import { parseStarCents, splitStarCents, formatStars, starCentsToLamports, formatLamportsSol, hexHash32 } from '../services/shine-support-amount.js'; import { transferSolLamports } from '../services/solana-wallet-service.js'; -import { loadVerifiedSupportTotals, formatVerifiedSupportLamports } from '../services/support-totals-service.js'; +import { getStarsQuoteFromRpc } from '../services/shine-stars-pyth.js'; +import { loadVerifiedSupportTotals, formatVerifiedSupportStars } from '../services/support-totals-service.js'; export const pageMeta = { id: 'channel-donate-view', get title() { return t('screens.channel_donate_view.text_001'); } }; @@ -189,7 +190,7 @@ export function render({ navigate, route, chrome }) {
- SOL + ⭐
@@ -198,7 +199,7 @@ export function render({ navigate, route, chrome }) {

- + `; const recipientSelect = content.querySelector('#channel-donate-recipient-key'); @@ -289,12 +290,17 @@ export function render({ navigate, route, chrome }) { }); refreshEl?.addEventListener('click', () => void refreshBalance()); + let starsQuote = null; const renderSplit = () => { try { - const amount = parseSolLamports(amountEl?.value || ''); - if (splitEl) splitEl.textContent = `${t('screens.support_flow.recipient')}: ${formatLamportsSol(amount * 9n / 10n)} SOL · ${t('screens.support_flow.fund')}: ${formatLamportsSol(amount / 10n)} SOL`; - } catch { if (splitEl) splitEl.textContent = ''; } + const cents = parseStarCents(amountEl?.value || ''); + const parts = splitStarCents(cents); + const sol = starsQuote ? ` · ≈ ${formatLamportsSol(starCentsToLamports(cents, starsQuote.solUsdE8, starsQuote.usdtUsdE8))} SOL` : ''; + if (splitEl) splitEl.textContent = `${t('screens.support_flow.recipient')}: ${formatStars(parts.author)} · ${t('screens.support_flow.fund')}: ${formatStars(parts.dao)}${sol}`; + } catch { if (splitEl) splitEl.textContent = 'Минимальная поддержка 0,10 ⭐'; } }; + void getStarsQuoteFromRpc({ solanaEndpoint: state.entrySettings.solanaServer }).then(v => { starsQuote = v; if (!disposed) renderSplit(); }) + .catch(() => { if (splitEl && !disposed) splitEl.textContent = 'Курс временно недоступен'; }); if (explanationEl) explanationEl.textContent = recipientPda ? t('screens.support_flow.explanation') : t('screens.support_flow.paid_required'); @@ -304,10 +310,10 @@ export function render({ navigate, route, chrome }) { if (busy || disposed) return; const recipient = selectedRecipient(); if (!recipient?.address) { setStatus(t('screens.channel_donate_view.text_007'), 'error'); return; } - let amount; + let amount, cents; try { - amount = parseSolLamports(amountEl?.value || ''); - if (!direct && amount % 10n !== 0n) throw new Error(t('screens.support_flow.divisible')); + cents = parseStarCents(amountEl?.value || ''); + if (direct) throw new Error('Прямой перевод отключён в системе Stars'); } catch (error) { setStatus(error.message || t('screens.channel_donate_view.text_008'), 'error'); return; } if (direct && !window.confirm(t('screens.support_flow.direct_warning'))) return; @@ -315,6 +321,8 @@ export function render({ navigate, route, chrome }) { setStatus(t('screens.channel_donate_view.text_009')); if (resultEl) { resultEl.hidden = true; resultEl.innerHTML = ''; } try { + starsQuote = await getStarsQuoteFromRpc({ solanaEndpoint: state.entrySettings.solanaServer }); + amount = starCentsToLamports(cents, starsQuote.solUsdE8, starsQuote.usdtUsdE8); const wallet = await resolveSenderWallet(); let result; if (direct) { @@ -337,6 +345,7 @@ export function render({ navigate, route, chrome }) { if (!secrets?.blockchainKey || !secrets?.clientKey) throw new Error(t('screens.support_flow.keys_required')); result = await supportShineUserOnSolana({ senderLogin: login, recipientLogin: ownerLogin, amountLamports: amount, + starCents: cents, oracleAccounts: { solUsd: starsQuote.solOracleAccount, usdtUsd: starsQuote.usdtOracleAccount }, target: { type: 1, channelBlockNumber: BigInt(selector.channelRootBlockNumber), channelBlockHash: hexHash32(selector.channelRootBlockHash) }, solanaEndpoint: state.entrySettings.solanaServer, blockchainPrivatePkcs8B64: secrets.blockchainKey, @@ -347,7 +356,7 @@ export function render({ navigate, route, chrome }) { setStatus(''); if (resultEl) { resultEl.hidden = false; - resultEl.innerHTML = `${th('screens.channel_donate_view.text_031')}${escapeHtml(formatLamportsSol(amount))} SOL → ${escapeHtml(recipient.label)}${escapeHtml(String(result.signature || ''))}`; + resultEl.innerHTML = `${th('screens.channel_donate_view.text_031')}${escapeHtml(formatStars(cents))} → ${escapeHtml(recipient.label)}${escapeHtml(String(result.signature || ''))}`; } showToast(t('screens.channel_donate_view.text_010')); const balance = await getBalanceSol({ endpoint: state.entrySettings.solanaServer, address: wallet.address }); @@ -363,7 +372,7 @@ export function render({ navigate, route, chrome }) { void loadVerifiedSupportTotals(selector).then((totals) => { if (disposed) return; const label = content.querySelector('#channel-donate-verified-total'); - const total = totals && formatVerifiedSupportLamports(totals.channelReceivedLamports); + const total = totals && formatVerifiedSupportStars(totals.channelReceivedStarCents); if (label && total) label.textContent = `${t('screens.support_phase3.channel_total')}: ${total}`; }); updateRecipientAddress(); diff --git a/shine-UI/js/pages/channel-view.js b/shine-UI/js/pages/channel-view.js index addfefbc..cadefd1f 100644 --- a/shine-UI/js/pages/channel-view.js +++ b/shine-UI/js/pages/channel-view.js @@ -1,6 +1,6 @@ import { openShineSupportDialog } from '../components/shine-support-dialog.js'; import { hexHash32 } from '../services/shine-support-amount.js'; -import { loadVerifiedSupportTotals, formatVerifiedSupportLamports } from '../services/support-totals-service.js'; +import { loadVerifiedSupportTotals, formatVerifiedSupportStars } from '../services/support-totals-service.js'; import { formatDateTime, getIntlLocale } from '../i18n/format.js'; import { t, th } from '../i18n/index.js'; import { appendShineMessageLinks } from '../services/shine-message-links.js'; @@ -2169,7 +2169,7 @@ function renderPostCard(post, { const messageId = `${String(post.messageRef.blockNumber)}:${String(post.messageRef.blockHash).toLowerCase()}`; void loadVerifiedSupportTotals(selector).then((totals) => { if (!totals || !supportButton.isConnected) return; - const formatted = formatVerifiedSupportLamports(totals.messages.get(messageId)); + const formatted = formatVerifiedSupportStars(totals.messages.get(messageId)); if (formatted) supportButton.textContent = `♥ ${formatted}`; }); } diff --git a/shine-UI/js/services/auth-service.js b/shine-UI/js/services/auth-service.js index 9cd416f0..19b9f1ef 100644 --- a/shine-UI/js/services/auth-service.js +++ b/shine-UI/js/services/auth-service.js @@ -1604,6 +1604,14 @@ export class AuthService { return response.payload || {}; } + async getSupportHistory(login, limit = 20, offset = 0) { + const response = await this.ws.request('GetSupportHistory', { + login: String(login || '').trim(), limit, offset, + }); + if (response.status !== 200) throw opError('GetSupportHistory', response); + return response.payload || {}; + } + async getSupportTotals(channel) { const payload = { channelRootBlockNumber: Number(channel?.channelRootBlockNumber), diff --git a/shine-UI/js/services/shine-stars-pyth.js b/shine-UI/js/services/shine-stars-pyth.js new file mode 100644 index 00000000..342d878b --- /dev/null +++ b/shine-UI/js/services/shine-stars-pyth.js @@ -0,0 +1,89 @@ +/** + * SHiNE Stars / Pyth Core: local price quote through SHiNE's existing authenticated + * Solana RPC endpoint. No Hermes, private API keys or server-side prices. + * Pyth price feed account format: PriceUpdateV2 (Anchor / Borsh). + */ +import { loadSolanaWeb3 } from '../vendor/solana-web3-loader.js'; + +export const PYTH_SOL_USD_FEED_ID = 'ef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d'; +export const PYTH_USDT_USD_FEED_ID = '2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b'; +export const PYTH_PUSH_ORACLE_PROGRAM_ID = 'pythWSnswVUd12oZpeFP8e9CVaEqJg25g1Vtc2biRsT'; +export const PYTH_RECEIVER_PROGRAM_ID = 'rec5EKMGg6MxZYaMdyBfgwp4d5rB9T1VQH5pJv5LtFJ'; +const PYTH_PRICE_UPDATE_DISCRIMINATOR = [34, 241, 35, 99, 157, 126, 244, 205]; +// Devnet допускает более редкие обновления Pyth; production-лимит должен быть строже. +export const MAX_PYTH_PRICE_AGE_SECONDS = 3_600; +export const MAX_PYTH_CONFIDENCE_PPM = 10_000n; // 1%, same as shine_users. +const MAX_SIGNED_FUTURE_SECONDS = 15; + +function bytesFromHex(hex) { + if (!/^[0-9a-f]{64}$/i.test(hex)) throw new Error('Invalid Pyth price feed ID'); + return Uint8Array.from(hex.match(/../g), (b) => parseInt(b, 16)); +} +function hexFromBytes(bytes) { return Array.from(bytes, (b) => b.toString(16).padStart(2, '0')).join(''); } + +/** Pyth's getPriceFeedAccountForProgram(shard=0, feedId): PDA([u16LE(shard), feedId], pushOracle). */ +export function deriveStarsPythOracleAccounts(solana) { + const program = new solana.PublicKey(PYTH_PUSH_ORACLE_PROGRAM_ID); + const shardZero = Uint8Array.of(0, 0); + const derive = (id) => solana.PublicKey.findProgramAddressSync([shardZero, bytesFromHex(id)], program)[0]; + return { solUsd: derive(PYTH_SOL_USD_FEED_ID).toBase58(), usdtUsd: derive(PYTH_USDT_USD_FEED_ID).toBase58() }; +} + +/** + * Parse verified Pyth PriceUpdateV2. The contract independently enforces identical + * owner/feed/age/confidence checks; this preflight parser is for UX, not security. + * Returns exact USD price * 10^8 as BigInt (same normalization as the Rust program). + */ +export function parseVerifiedPythPriceAccount(account, expectedFeedId, nowSeconds = Math.floor(Date.now() / 1000)) { + if (!account?.data || account.owner?.toBase58?.() !== PYTH_RECEIVER_PROGRAM_ID) { + throw new Error('Pyth: ценовой аккаунт отсутствует или имеет неверного владельца'); + } + const bytes = account.data instanceof Uint8Array ? account.data : new Uint8Array(account.data); + if (bytes.length < 133 || PYTH_PRICE_UPDATE_DISCRIMINATOR.some((b, i) => bytes[i] !== b)) { + throw new Error('Pyth: неверный формат ценового аккаунта'); + } + // Anchor discriminator (8), write authority (32), Borsh enum Full = 1 (Partial = 0 + signatures byte). + if (bytes[40] !== 1) throw new Error('Pyth: цена не прошла полную проверку подписей'); + const start = 41; + if (hexFromBytes(bytes.subarray(start, start + 32)) !== expectedFeedId) { + throw new Error('Pyth: аккаунт содержит другую валютную пару'); + } + const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength); + const price = view.getBigInt64(start + 32, true); + const confidence = view.getBigUint64(start + 40, true); + const exponent = view.getInt32(start + 48, true); + const publishedAt = view.getBigInt64(start + 52, true); + if (price <= 0n || price * MAX_PYTH_CONFIDENCE_PPM < confidence * 1_000_000n) { + throw new Error('Pyth: некорректная цена или высокий доверительный интервал'); + } + const now = BigInt(Math.floor(nowSeconds)); + if (publishedAt > now + BigInt(MAX_SIGNED_FUTURE_SECONDS) || + now - publishedAt > BigInt(MAX_PYTH_PRICE_AGE_SECONDS)) { + throw new Error('Pyth: цена устарела или имеет некорректное время'); + } + const power = exponent + 8; + if (power < -18 || power > 18) throw new Error('Pyth: неподдерживаемая точность цены'); + const priceE8 = power >= 0 ? price * 10n ** BigInt(power) : price / (10n ** BigInt(-power)); + if (priceE8 <= 0n) throw new Error('Pyth: цена слишком мала'); + return { priceE8, publishTimeSeconds: Number(publishedAt), confidence, exponent }; +} + +/** Always read BOTH feeds in the same Solana RPC request; no cached/off-chain quote accepted. */ +export async function getStarsQuoteFromRpc({ solanaEndpoint, solana = null, connection = null, nowSeconds } = {}) { + const endpoint = String(solanaEndpoint || '').trim(); + if (!connection && !endpoint) throw new Error('Solana RPC для SHiNE не подключён'); + const web3 = solana || await loadSolanaWeb3(); + const conn = connection || new web3.Connection(endpoint, 'confirmed'); + const oracleAccounts = deriveStarsPythOracleAccounts(web3); + const keys = [new web3.PublicKey(oracleAccounts.solUsd), new web3.PublicKey(oracleAccounts.usdtUsd)]; + const infos = await conn.getMultipleAccountsInfo(keys, 'confirmed'); + if (!infos || infos.length !== 2) throw new Error('Pyth: не получены цены SOL и USDT из Solana'); + const now = nowSeconds ?? Math.floor(Date.now() / 1000); + const sol = parseVerifiedPythPriceAccount(infos[0], PYTH_SOL_USD_FEED_ID, now); + const usdt = parseVerifiedPythPriceAccount(infos[1], PYTH_USDT_USD_FEED_ID, now); + return { + solUsdE8: sol.priceE8.toString(), usdtUsdE8: usdt.priceE8.toString(), + solOracleAccount: oracleAccounts.solUsd, usdtOracleAccount: oracleAccounts.usdtUsd, + publishedAtSeconds: Math.min(sol.publishTimeSeconds, usdt.publishTimeSeconds), + }; +} diff --git a/shine-UI/js/services/shine-support-amount.js b/shine-UI/js/services/shine-support-amount.js index 747eb7d2..70c1837c 100644 --- a/shine-UI/js/services/shine-support-amount.js +++ b/shine-UI/js/services/shine-support-amount.js @@ -18,3 +18,29 @@ export function hexHash32(value) { if (!/^[0-9a-f]{64}$/.test(hex)) throw new Error('Некорректный 32-байтовый хеш блока канала'); return Uint8Array.from({ length: 32 }, (_, i) => parseInt(hex.slice(i * 2, i * 2 + 2), 16)); } + +/** Integer Star cents: 0.10 minimum, exactly two decimal places maximum. */ +export function parseStarCents(input) { + const value = String(input ?? '').trim().replace(',', '.'); + if (!/^(?:0|[1-9]\d*)(?:\.\d{1,2})?$/.test(value)) throw new Error('Введите сумму ⭐ с точностью до 0,01'); + const [whole, frac = ''] = value.split('.'); + const cents = BigInt(whole) * 100n + BigInt(frac.padEnd(2, '0') || '0'); + if (cents < 10n || cents > 0xffff_ffff_ffff_ffffn) throw new Error('Минимальная поддержка — 0,10 ⭐'); + return cents; +} +export function formatStars(value) { + const cents = BigInt(value); + return `${cents / 100n}.${String(cents % 100n).padStart(2, '0')} ⭐`; +} +export function splitStarCents(value) { + const cents = BigInt(value); + const dao = (cents + 9n) / 10n; + return { author: cents - dao, dao }; +} +/** Quote Pyth prices as USD x 10^8; no Number or rounding-sensitive floats. */ +export function starCentsToLamports(starCents, solPriceE8, usdtPriceE8) { + const cents = BigInt(starCents), sol = BigInt(solPriceE8), usdt = BigInt(usdtPriceE8); + if (sol <= 0n || usdt <= 0n) throw new Error('Нет актуального курса'); + // ceil ensures enough lamports for the requested Stars. + return (cents * 1_000_000_000n * usdt + 100n * sol - 1n) / (100n * sol); +} diff --git a/shine-UI/js/services/shine-user-pda-service.js b/shine-UI/js/services/shine-user-pda-service.js index 4fcbbbdc..dd59ddae 100644 --- a/shine-UI/js/services/shine-user-pda-service.js +++ b/shine-UI/js/services/shine-user-pda-service.js @@ -292,10 +292,10 @@ export function parseShineUserPda(dataBytes) { const unsignedBytes = bytes.slice(0, recordLen - 64); let supportStats = { version: 0, supportSent: 0n, supportReceived: 0n, daoDirect: 0n }; if (recordLen < bytes.length && bytes[recordLen] !== 0) { - if (bytes[recordLen] !== 1) throw new Error('Неподдерживаемая версия статистики поддержки'); + if (bytes[recordLen] !== 2) throw new Error('Неподдерживаемая версия статистики поддержки'); if (recordLen + 25 > bytes.length) throw new Error('Обрезан блок статистики поддержки'); const statsReader = makeReader(bytes.slice(recordLen + 1, recordLen + 25)); - supportStats = { version: 1, supportSent: statsReader.readU64(), supportReceived: statsReader.readU64(), daoDirect: statsReader.readU64() }; + supportStats = { version: 2, supportSent: statsReader.readU64(), supportReceived: statsReader.readU64(), daoDirect: statsReader.readU64() }; } const header = { formatMajor, formatMinor, recordLen, createdAtMs, updatedAtMs, recordNumber, prevRecordHash, login, blocksCount, blocksOffset, signature, unsignedBytes, supportStats }; return parseV12Pda(bytes, header); @@ -825,12 +825,13 @@ export function calcLimitTopupPriceLamports(additionalLimitBytes, lamportsPerLim export function getLimitStepBytes() { return LIMIT_STEP; } -function supportData(tag, senderLogin, recipientLogin, amountLamports, target) { +function supportData(tag, senderLogin, recipientLogin, amountLamports, starCents, target) { const out = [tag]; const putString = (value) => { const bytes = new TextEncoder().encode(String(value)); if (bytes.length > 255) throw new Error('Слишком длинный login'); out.push(bytes.length, ...bytes); }; putString(senderLogin); if (recipientLogin != null) putString(recipientLogin); pushU64LE(out, amountLamports); + pushU64LE(out, starCents); if (target != null) { out.push(target.type); if (target.type === 1 || target.type === 2) { pushU64LE(out, target.channelBlockNumber); out.push(...toUint8Array(target.channelBlockHash, 32)); } @@ -840,9 +841,9 @@ function supportData(tag, senderLogin, recipientLogin, amountLamports, target) { } /** Выполняет учитываемую поддержку через shine_users без Number и округлений. */ -export async function supportShineUserOnSolana({ senderLogin, recipientLogin, amountLamports, target = { type: 0 }, solanaEndpoint, blockchainPrivatePkcs8B64, clientPrivatePkcs8B64 }) { +export async function supportShineUserOnSolana({ senderLogin, recipientLogin, amountLamports, starCents, oracleAccounts, target = { type: 0 }, solanaEndpoint, blockchainPrivatePkcs8B64, clientPrivatePkcs8B64 }) { const amount = BigInt(amountLamports); - if (amount <= 0n || amount % 10n !== 0n) throw new Error('Сумма учитываемой поддержки должна быть положительной и кратной 10 lamports'); + if (amount <= 0n || BigInt(starCents) < 10n) throw new Error('Сумма поддержки должна быть не менее 0,10 ⭐'); const sender = await readShineUserPda({ login: senderLogin, solanaEndpoint }); const recipient = await readShineUserPda({ login: recipientLogin, solanaEndpoint }); const ctx = await buildCommonContext({ login: sender.login, solanaEndpoint, clientPrivatePkcs8B64, payerPrivatePkcs8B64: blockchainPrivatePkcs8B64 }); @@ -855,21 +856,25 @@ export async function supportShineUserOnSolana({ senderLogin, recipientLogin, am { pubkey: recipientKey, isSigner: false, isWritable: true }, { pubkey: recipientPda, isSigner: false, isWritable: true }, { pubkey: ctx.inflowVault, isSigner: false, isWritable: true }, { pubkey: ctx.economyConfigPda, isSigner: false, isWritable: false }, { pubkey: ctx.solana.SystemProgram.programId, isSigner: false, isWritable: false }, - ], data: supportData(IX_SUPPORT_USER, sender.login, recipient.login, amount, target) }); + { pubkey: new ctx.solana.PublicKey(oracleAccounts.solUsd), isSigner: false, isWritable: false }, + { pubkey: new ctx.solana.PublicKey(oracleAccounts.usdtUsd), isSigner: false, isWritable: false }, + ], data: supportData(IX_SUPPORT_USER, sender.login, recipient.login, amount, BigInt(starCents), target) }); const signature = await sendAndConfirmSolanaHttp(ctx.connection, new ctx.solana.Transaction().add(ix), [ctx.payerKeypair]); - return { signature, amountLamports: amount, recipientLamports: amount * 9n / 10n, inflowLamports: amount / 10n }; + return { signature, amountLamports: amount, starCents: BigInt(starCents), recipientLamports: amount - (amount + 9n) / 10n, inflowLamports: (amount + 9n) / 10n }; } -export async function supportShineDaoOnSolana({ senderLogin, amountLamports, solanaEndpoint, blockchainPrivatePkcs8B64, clientPrivatePkcs8B64 }) { +export async function supportShineDaoOnSolana({ senderLogin, amountLamports, starCents, oracleAccounts, solanaEndpoint, blockchainPrivatePkcs8B64, clientPrivatePkcs8B64 }) { const amount = BigInt(amountLamports); - if (amount <= 0n) throw new Error('Сумма пожертвования должна быть положительной'); + if (amount <= 0n || BigInt(starCents) < 10n) throw new Error('Минимальный донат 0,10 ⭐'); const sender = await readShineUserPda({ login: senderLogin, solanaEndpoint }); const ctx = await buildCommonContext({ login: sender.login, solanaEndpoint, clientPrivatePkcs8B64, payerPrivatePkcs8B64: blockchainPrivatePkcs8B64 }); const ix = new ctx.solana.TransactionInstruction({ programId: new ctx.solana.PublicKey(SHINE_USERS_PROGRAM_ID), keys: [ { pubkey: ctx.payerKeypair.publicKey, isSigner: true, isWritable: true }, { pubkey: ctx.userPda, isSigner: false, isWritable: true }, { pubkey: ctx.inflowVault, isSigner: false, isWritable: true }, { pubkey: ctx.economyConfigPda, isSigner: false, isWritable: false }, { pubkey: ctx.solana.SystemProgram.programId, isSigner: false, isWritable: false }, - ], data: supportData(IX_SUPPORT_DAO, sender.login, null, amount, null) }); + { pubkey: new ctx.solana.PublicKey(oracleAccounts.solUsd), isSigner: false, isWritable: false }, + { pubkey: new ctx.solana.PublicKey(oracleAccounts.usdtUsd), isSigner: false, isWritable: false }, + ], data: supportData(IX_SUPPORT_DAO, sender.login, null, amount, BigInt(starCents), null) }); const signature = await sendAndConfirmSolanaHttp(ctx.connection, new ctx.solana.Transaction().add(ix), [ctx.payerKeypair]); - return { signature, amountLamports: amount }; + return { signature, amountLamports: amount, starCents: BigInt(starCents) }; } diff --git a/shine-UI/js/services/support-totals-service.js b/shine-UI/js/services/support-totals-service.js index 948dd94e..6b5a1f5c 100644 --- a/shine-UI/js/services/support-totals-service.js +++ b/shine-UI/js/services/support-totals-service.js @@ -13,9 +13,9 @@ export function loadVerifiedSupportTotals(selector) { const messages = new Map(); for (const row of response?.messages || []) { const id = `${String(row.blockNumber)}:${String(row.blockHash).toLowerCase()}`; - messages.set(id, String(row.receivedLamports)); + messages.set(id, String(row.receivedStarCents)); } - return { channelReceivedLamports: String(response?.channelReceivedLamports || '0'), messages }; + return { channelReceivedStarCents: String(response?.channelReceivedStarCents || '0'), messages }; }) .catch(() => { cache.delete(key); return null; }); cache.set(key, promise); @@ -23,12 +23,12 @@ export function loadVerifiedSupportTotals(selector) { return cache.get(key); } -export function formatVerifiedSupportLamports(value) { +export function formatVerifiedSupportStars(value) { try { const n = BigInt(value); if (n <= 0n) return null; - const whole = n / 1_000_000_000n; - const fraction = String(n % 1_000_000_000n).padStart(9, '0').replace(/0+$/, ''); - return `${whole}${fraction ? '.' + fraction : ''} SOL`; + const whole = n / 100n; + const fraction = String(n % 100n).padStart(2, '0'); + return `${whole}.${fraction} ⭐`; } catch { return null; } } diff --git a/shine-UI/tests/stars-pyth-rpc.test.mjs b/shine-UI/tests/stars-pyth-rpc.test.mjs new file mode 100644 index 00000000..7749d5af --- /dev/null +++ b/shine-UI/tests/stars-pyth-rpc.test.mjs @@ -0,0 +1,85 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { readFileSync } from 'node:fs'; +import vm from 'node:vm'; +import { + deriveStarsPythOracleAccounts, + getStarsQuoteFromRpc, + parseVerifiedPythPriceAccount, + PYTH_SOL_USD_FEED_ID, + PYTH_USDT_USD_FEED_ID, + PYTH_RECEIVER_PROGRAM_ID, +} from '../js/services/shine-stars-pyth.js'; + +const validOwner = { toBase58: () => PYTH_RECEIVER_PROGRAM_ID }; +const now = 1_800_000_000; +const discr = [34,241,35,99,157,126,244,205]; +function fakePrice(feed, value, { publish = now - 15, confidence = 20_000_000n, verified = true, owner = validOwner, exponent = -8 } = {}) { + const bytes = new Uint8Array(133); + bytes.set(discr); + bytes[40] = verified ? 1 : 0; + bytes.set(Uint8Array.from(feed.match(/../g), (hex) => parseInt(hex, 16)), 41); + const v = new DataView(bytes.buffer); + v.setBigInt64(73, BigInt(value), true); + v.setBigUint64(81, confidence, true); + v.setInt32(89, exponent, true); + v.setBigInt64(93, BigInt(publish), true); + return { owner, data: bytes }; +} +const solPrice = fakePrice(PYTH_SOL_USD_FEED_ID, 15_000_000_000n); // $150.00 +const usdtPrice = fakePrice(PYTH_USDT_USD_FEED_ID, 100_000_000n, {confidence: 1000n}); // $1.00 + +// Browser-vendored Solana web3.js; no network required, same code as production. +const context = { Buffer, Uint8Array, TextEncoder, TextDecoder, console, setTimeout, crypto: globalThis.crypto }; +vm.createContext(context); +vm.runInContext(readFileSync(new URL('../js/vendor/solana-web3.iife.min.js', import.meta.url), 'utf8'), context); +const solana = context.solanaWeb3; + +test('derive shard-0 Pyth Core oracle PDAs (official mainnet examples)', () => { + assert.deepEqual(deriveStarsPythOracleAccounts(solana), { + solUsd: '7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE', + usdtUsd: 'HT2PLQBcG5EiCcNSaMHAjSgd9F98ecpATbk4Sk5oYuM', + }); +}); +test('read raw Anchor PriceUpdateV2 without precision loss', () => { + assert.equal(parseVerifiedPythPriceAccount(solPrice, PYTH_SOL_USD_FEED_ID, now).priceE8, 15_000_000_000n); + assert.equal(parseVerifiedPythPriceAccount(usdtPrice, PYTH_USDT_USD_FEED_ID, now).priceE8, 100_000_000n); +}); +test('fail closed for stale/future/unverified/malformed/foreign price accounts', () => { + assert.throws(() => parseVerifiedPythPriceAccount(fakePrice(PYTH_SOL_USD_FEED_ID, 15_000_000_000n, {publish: now - 3_601}), PYTH_SOL_USD_FEED_ID, now), /устарела/); + assert.throws(() => parseVerifiedPythPriceAccount(fakePrice(PYTH_SOL_USD_FEED_ID, 15_000_000_000n, {publish: now + 16}), PYTH_SOL_USD_FEED_ID, now), /время/); + assert.throws(() => parseVerifiedPythPriceAccount(fakePrice(PYTH_SOL_USD_FEED_ID, 15_000_000_000n, {verified:false}), PYTH_SOL_USD_FEED_ID, now), /проверку/); + assert.throws(() => parseVerifiedPythPriceAccount(fakePrice(PYTH_SOL_USD_FEED_ID, 15_000_000_000n), PYTH_USDT_USD_FEED_ID, now), /другую/); + assert.throws(() => parseVerifiedPythPriceAccount(fakePrice(PYTH_SOL_USD_FEED_ID, 15_000_000_000n, {owner:{toBase58:()=> 'Bad'}}), PYTH_SOL_USD_FEED_ID, now), /владельца/); + assert.throws(() => parseVerifiedPythPriceAccount(fakePrice(PYTH_SOL_USD_FEED_ID, 15_000_000_000n, {confidence: 150_000_001n}), PYTH_SOL_USD_FEED_ID, now), /интервал/); + const invalid = fakePrice(PYTH_SOL_USD_FEED_ID, 15_000_000_000n); + invalid.data[0] ^= 1; + assert.throws(() => parseVerifiedPythPriceAccount(invalid, PYTH_SOL_USD_FEED_ID, now), /формат/); +}); +test('request both accounts once from authenticated Solana RPC, no Hermes', async () => { + let invoked = 0; + const connection = { getMultipleAccountsInfo: async (keys, commitment) => { + invoked++; + assert.equal(keys.length, 2); + assert.equal(commitment, 'confirmed'); + assert.equal(keys[0].toBase58(), '7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE'); + return [solPrice, usdtPrice]; + } }; + const quote = await getStarsQuoteFromRpc({ solanaEndpoint: 'https://test.shineup.me/solana-rpc', solana, connection, nowSeconds: now }); + assert.equal(quote.solUsdE8, '15000000000'); + assert.equal(quote.usdtUsdE8, '100000000'); + assert.equal(invoked, 1); + await assert.rejects(() => getStarsQuoteFromRpc({ solanaEndpoint: 'https://test.shineup.me/solana-rpc', solana, + connection: { getMultipleAccountsInfo: async () => [solPrice, null] }, nowSeconds: now }), /отсутствует/); +}); +test('no server GetStarsQuote in active WS registry or UI', () => { + const reg = readFileSync(new URL('../../SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/JsonHandlerRegistry.java', import.meta.url), 'utf8'); + const auth = readFileSync(new URL('../js/services/auth-service.js', import.meta.url), 'utf8'); + assert.doesNotMatch(reg, /GetStarsQuote/); + assert.doesNotMatch(auth, /GetStarsQuote/); + for (const p of ['../js/components/shine-support-dialog.js', '../js/pages/channel-donate-view.js']) { + const s = readFileSync(new URL(p, import.meta.url), 'utf8'); + assert.match(s, /getStarsQuoteFromRpc/); + assert.doesNotMatch(s, /authService\.getStarsQuote/); + } +}); diff --git a/shine-UI/tests/stars-v1.test.mjs b/shine-UI/tests/stars-v1.test.mjs new file mode 100644 index 00000000..74861078 --- /dev/null +++ b/shine-UI/tests/stars-v1.test.mjs @@ -0,0 +1,19 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { parseStarCents, formatStars, splitStarCents, starCentsToLamports } from '../js/services/shine-support-amount.js'; +test('strictly two fractional digits, minimum 0.10 Stars', () => { + assert.equal(parseStarCents('0,10'), 10n); + assert.equal(parseStarCents('0.75'), 75n); + assert.equal(formatStars(75n), '0.75 ⭐'); + assert.throws(() => parseStarCents('0.09')); + assert.throws(() => parseStarCents('0.001')); +}); +test('DAO star share rounds UP to cents', () => { + assert.deepEqual(splitStarCents(10n), {author: 9n, dao: 1n}); + assert.deepEqual(splitStarCents(15n), {author: 13n, dao: 2n}); + assert.deepEqual(splitStarCents(75n), {author: 67n, dao: 8n}); +}); +test('quote works in integer lamports without floats', () => { + assert.equal(starCentsToLamports(75n, 150n * 100_000_000n, 100_000_000n), 5_000_000n); + assert.equal(starCentsToLamports(10n, 150n * 100_000_000n, 100_000_000n), 666_667n); +}); diff --git a/shine-UI/tests/support-phase2.test.mjs b/shine-UI/tests/support-phase2.test.mjs index c817049d..176d28ca 100644 --- a/shine-UI/tests/support-phase2.test.mjs +++ b/shine-UI/tests/support-phase2.test.mjs @@ -5,10 +5,10 @@ import { supportStatsValues } from '../js/components/support-stats.js'; function file(path) { return readFileSync(new URL(path, import.meta.url), 'utf8'); } -test('three displayed counters: full sent, net received, sent/10 + direct', () => { - assert.deepEqual(supportStatsValues({ supportSent: 1_000_000_000n, supportReceived: 900_000_000n, daoDirect: 200_000_000n }), [1_000_000_000n, 900_000_000n, 300_000_000n]); +test('three displayed counters: sent, received, direct DAO in star cents', () => { + assert.deepEqual(supportStatsValues({ supportSent: 1_000_000_000n, supportReceived: 900_000_000n, daoDirect: 200_000_000n }), [1_000_000_000n, 900_000_000n, 200_000_000n]); assert.deepEqual(supportStatsValues({}), [0n, 0n, 0n]); - assert.deepEqual(supportStatsValues({ supportSent: '10000000000000000000', supportReceived: '9000000000000000000', daoDirect: '250000000000000000' }), [10000000000000000000n, 9000000000000000000n, 1250000000000000000n]); + assert.deepEqual(supportStatsValues({ supportSent: '10000000000000000000', supportReceived: '9000000000000000000', daoDirect: '250000000000000000' }), [10000000000000000000n, 9000000000000000000n, 250000000000000000n]); }); test('profile views attach counters from server cache and support user action', () => { @@ -35,13 +35,13 @@ test('message buttons pass checked block hashes, not message text', () => { } }); -test('shared modal protects direct and tracked workflows', () => { +test('shared modal requires Stars and oracle quote', () => { const src = file('../js/components/shine-support-dialog.js'); assert.match(src, /supportShineUserOnSolana/); assert.match(src, /supportShineDaoOnSolana/); - assert.match(src, /transferSolLamports/); - assert.match(src, /window\.confirm\(t\('screens\.support_phase2\.direct_warning'\)\)/); - assert.match(src, /amount % 10n/); + assert.match(src, /starCentsToLamports/); + assert.match(src, /getStarsQuoteFromRpc/); + assert.match(src, /parseStarCents/); }); test('profile statistics use server API without Solana RPC', () => { diff --git a/shine-solana/shine/Cargo.lock b/shine-solana/shine/Cargo.lock index b92b97e7..882e50de 100644 --- a/shine-solana/shine/Cargo.lock +++ b/shine-solana/shine/Cargo.lock @@ -1233,6 +1233,8 @@ dependencies = [ name = "shine_users" version = "0.1.0" dependencies = [ + "anchor-lang", + "pyth-solana-receiver-sdk", "solana-program", ] diff --git a/shine-solana/shine/doc/formats/shine-user-pda-format-v.1.2.md b/shine-solana/shine/doc/formats/shine-user-pda-format-v.1.2.md index e846c0c5..a34e7a47 100644 --- a/shine-solana/shine/doc/formats/shine-user-pda-format-v.1.2.md +++ b/shine-solana/shine/doc/formats/shine-user-pda-format-v.1.2.md @@ -202,12 +202,14 @@ Legacy migration в 1.2 отсутствует. После удаления те | Смещение | Поле | Формат | | --- | --- | --- | -| 0 | version | `u8` (`1`) | +| 0 | version | `u8` (`2` — Stars cents) | | 1 | support_sent | `u64 LE` | | 9 | support_received | `u64 LE` | | 17 | dao_direct | `u64 LE` | -Полный размер v1 — 25 байт. Если за `record_len` нет байтов либо первый байт -равен `0`, это v0 и все значения равны нулю. Неизвестная версия или неполный -v1 являются повреждённым форматом. Программа вправе обновлять этот блок без -пользовательской подписи; при update старой записи v0 он создаётся автоматически. +Полный размер v2 — 25 байт. Все три `u64` — **сотые доли Stars**, не lamports. +Если блока нет или версия `0`, счётчики равны нулю. В чистой тестовой сети +блок v1 со старыми lamports намеренно игнорируется (значения = 0) и при +следующей записи PDA заменяется v2 без переноса сумм. Неизвестные версии +отклоняются. Программа обновляет блок без отдельной пользовательской подписи, +атомарно с переводом SOL при успешном донате. diff --git a/shine-solana/shine/doc/programs/shine_users.md b/shine-solana/shine/doc/programs/shine_users.md index 5d9f69c2..032dd5dd 100644 --- a/shine-solana/shine/doc/programs/shine_users.md +++ b/shine-solana/shine/doc/programs/shine_users.md @@ -190,15 +190,40 @@ Accounts: signer/current upgrade authority writable, namespace PDA writable, sys `20_000` lamports в существующий `shine_payments_inflow_vault`, дополнительно к оплате увеличения лимита и rent. Ошибка инструкции откатывает и запись, и перевод. -Инструкция `9` (`support_user`) принимает sender/recipient login, `u64 LE` -сумму, target (`USER=0`, `CHANNEL=1`, `MESSAGE=2`) и соответствующие бинарные -идентификаторы блоков/хешей. Сумма положительна и кратна 10; 90% переводится -актуальному blockchain-key получателя, 10% — только в inflow vault. Отправитель -и получатель обязаны быть разными paid PDA с актуальными ключами. В транзакции -read-only присутствует economy PDA для индексирования. Обновляются -`support_sent` и `support_received`. +### Stars v1 (Devnet, без истории legacy) -Инструкция `10` (`support_dao`) принимает login и положительную сумму, переводит -100% в тот же inflow vault и увеличивает `dao_direct`. Она также требует paid PDA, -актуальный blockchain key и read-only economy PDA. Ни одна из инструкций не -переводит средства непосредственно в `dao_wallet`. +Все инструкции поддержки передают `amount_lamports:u64 LE` и +`amount_star_cents:u64 LE` (1 ⭐ = 100 cents, минимум 10 cents = 0,10 ⭐). +Курс Stars = 1 USDT; на входе SOL/USD и USDT/USD как readonly +`PriceUpdateV2` Pyth (после `system_program`). Программа проверяет owner +Pyth Receiver, точный feed id, полную верификацию, возраст ≤ 3600 сек (1 час для Devnet), +относительную погрешность цены ≤ 1% и совпадение стоимости в Stars +с погрешностью ≤ 0,5%. Нарушение любого ограничения откатывает перевод. + +**Важно перед Mainnet:** часовой лимит установлен только для нестабильного Devnet. +Перед публикацией Stars в Mainnet нужно отдельно выбрать и задеплоить более строгий +лимит свежести Pyth; значение `3600` нельзя переносить в Mainnet автоматически. + +Инструкция `9` (`support_user`) сериализуется как: +`tag=9; sender_login:string_u8; recipient_login:string_u8; amount_lamports:u64LE; +amount_star_cents:u64LE; target:u8; [channel_number:u64LE;channel_hash:bytes32]; +[message_number:u64LE;message_hash:bytes32]`. +Счётчик `support_sent` увеличивается на полную сумму Stars; `support_received` +получателя — на `amount_star_cents - ceil(amount_star_cents/10)`. +Фактические SOL распределяются 90/10 с округлением доли vault вверх до +одного lamport. Получатель должен быть отдельным Paid PDA с актуальным ключом. + +Инструкция `10` (`support_dao`): +`tag=10; sender_login:string_u8; amount_lamports:u64LE; amount_star_cents:u64LE`. +Все SOL идут в `shine_payments_inflow_vault`, счётчик `dao_direct` увеличивается +на Stars. Оба вида донатов используют readonly economy PDA для индексации. + +В конце каждой успешной инструкции выводится транзакционный лог +`SHINE_STARS_V1|USER|sender|recipient|lamports|star_cents|author_cents|dao_cents` +либо `SHINE_STARS_V1|DAO|sender|-|lamports|star_cents|0|star_cents`. +Это доказательство успешной операции для индексатора вместе с meta.err=null. +Stars не имеют токена/баланса: это только неизменяемые суммы поддержки. + +В чистом тестовом запуске исторические счётчики lamports v1 принимаются за нуль +и при следующем обновлении PDA заменяются форматом Stars v2; история тех +переводов не импортируется. diff --git a/shine-solana/shine/programs/shine_users/Cargo.toml b/shine-solana/shine/programs/shine_users/Cargo.toml index 7752a3fb..d4d8d2e6 100644 --- a/shine-solana/shine/programs/shine_users/Cargo.toml +++ b/shine-solana/shine/programs/shine_users/Cargo.toml @@ -7,15 +7,18 @@ edition = "2021" [lib] crate-type = ["cdylib", "lib"] name = "shine_users" -test = false -doctest = false +test = true +doctest = true bench = false [dependencies] solana-program = "2.1.21" +anchor-lang = "=0.31.1" +pyth-solana-receiver-sdk = "=0.6.0" [features] default = [] no-entrypoint = [] custom-heap = [] custom-panic = [] +idl-build = ["anchor-lang/idl-build"] diff --git a/shine-solana/shine/programs/shine_users/src/lib.rs b/shine-solana/shine/programs/shine_users/src/lib.rs index 1771845c..4473c8de 100644 --- a/shine-solana/shine/programs/shine_users/src/lib.rs +++ b/shine-solana/shine/programs/shine_users/src/lib.rs @@ -15,6 +15,8 @@ use solana_program::{ sysvar::{instructions::{load_current_index_checked, load_instruction_at_checked}, Sysvar}, }; use std::{convert::TryFrom, str::FromStr}; +use anchor_lang::AccountDeserialize; +use pyth_solana_receiver_sdk::price_update::{get_feed_id_from_hex, PriceUpdateV2}; pub mod settings; @@ -49,7 +51,7 @@ const IX_CREATE_NAMESPACE: u8 = 7; const IX_UPDATE_NAMESPACE_PRICE: u8 = 8; const IX_SUPPORT_USER: u8 = 9; const IX_SUPPORT_DAO: u8 = 10; -const SUPPORT_STATS_VERSION: u8 = 1; +const SUPPORT_STATS_VERSION: u8 = 2; // ONLY Stars cents, old SOL stats rejected const SUPPORT_STATS_LEN: usize = 25; const SUPPORT_TARGET_USER: u8 = 0; const SUPPORT_TARGET_CHANNEL: u8 = 1; @@ -108,6 +110,10 @@ enum ShineUsersError { UnsupportedNamespaceCurrency = 46, InvalidSupport = 47, UnsupportedSupportStats = 48, + InvalidStars = 49, + InvalidOracle = 50, + StaleOracle = 51, + StarRateMismatch = 52, } impl From for ProgramError { @@ -174,6 +180,7 @@ struct SupportUserArgs { sender_login: String, recipient_login: String, amount_lamports: u64, + amount_star_cents: u64, target_type: u8, channel_block_number: Option, channel_block_hash: Option<[u8; 32]>, @@ -182,7 +189,7 @@ struct SupportUserArgs { } #[derive(Clone, Debug)] -struct SupportDaoArgs { sender_login: String, amount_lamports: u64 } +struct SupportDaoArgs { sender_login: String, amount_lamports: u64, amount_star_cents: u64 } impl UserRecordV12 { fn active_fork(&self) -> Result<&ForkRecordV12, ProgramError> { @@ -352,6 +359,7 @@ fn dispatch_support_user(program_id: &Pubkey, accounts: &[AccountInfo], mut r: R let sender_login = r.read_string_u8()?; let recipient_login = r.read_string_u8()?; let amount_lamports = r.read_u64()?; + let amount_star_cents = r.read_u64()?; let target_type = r.read_u8()?; let (channel_block_number, channel_block_hash, message_block_number, message_block_hash) = match target_type { SUPPORT_TARGET_USER => (None, None, None, None), @@ -360,11 +368,11 @@ fn dispatch_support_user(program_id: &Pubkey, accounts: &[AccountInfo], mut r: R _ => return Err(ShineUsersError::InvalidSupport.into()), }; r.finish()?; - process_support_user(program_id, accounts, SupportUserArgs { sender_login, recipient_login, amount_lamports, target_type, channel_block_number, channel_block_hash, message_block_number, message_block_hash }) + process_support_user(program_id, accounts, SupportUserArgs { sender_login, recipient_login, amount_lamports, amount_star_cents, target_type, channel_block_number, channel_block_hash, message_block_number, message_block_hash }) } fn dispatch_support_dao(program_id: &Pubkey, accounts: &[AccountInfo], mut r: Reader<'_>) -> ProgramResult { - let args = SupportDaoArgs { sender_login: r.read_string_u8()?, amount_lamports: r.read_u64()? }; + let args = SupportDaoArgs { sender_login: r.read_string_u8()?, amount_lamports: r.read_u64()?, amount_star_cents: r.read_u64()? }; r.finish()?; process_support_dao(program_id, accounts, args) } @@ -829,6 +837,55 @@ fn process_update_user_pda(program_id: &Pubkey, accounts: &[AccountInfo], args: /// Accounts: signer(sender wallet), sender PDA, recipient wallet, recipient PDA, /// inflow vault, economy config (readonly), system program. Экономический PDA /// намеренно присутствует в каждой операции для индексирования истории. + +// SHiNE Stars v1: 1 Star = 1 USDT reference unit. Both prices are full-verification +// Pyth price-update accounts. No client-provided price is trusted. +const PYTH_SOL_FEED: &str = "0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d"; +const PYTH_USDT_FEED: &str = "0x2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b"; +// Devnet допускает более редкие обновления Pyth; production-лимит должен быть строже. +const ORACLE_MAX_AGE_SECONDS: u64 = 3_600; +const ORACLE_CONFIDENCE_MAX_PPM: u128 = 10_000; // 1%, reject weak feeds + +fn verified_pyth_price(account: &AccountInfo, feed: &str) -> Result { + require_keys_eq!(*account.owner, pyth_solana_receiver_sdk::ID, ShineUsersError::InvalidOracle); + let raw = account.try_borrow_data()?; + let mut bytes: &[u8] = &raw; + let update = PriceUpdateV2::try_deserialize(&mut bytes) + .map_err(|_| ProgramError::from(ShineUsersError::InvalidOracle))?; + let feed_id = get_feed_id_from_hex(feed).map_err(|_| ProgramError::from(ShineUsersError::InvalidOracle))?; + let price = update.get_price_no_older_than(&Clock::get()?, ORACLE_MAX_AGE_SECONDS, &feed_id) + .map_err(|_| ProgramError::from(ShineUsersError::StaleOracle))?; + require!(price.price > 0, ShineUsersError::InvalidOracle); + let p = price.price as u128; + require!((price.conf as u128).checked_mul(1_000_000).ok_or(ShineUsersError::MathOverflow)? + <= p.checked_mul(ORACLE_CONFIDENCE_MAX_PPM).ok_or(ShineUsersError::MathOverflow)?, ShineUsersError::InvalidOracle); + // Normalize to price * 10^8 without floating point. + let power = i64::from(price.exponent) + 8; + require!((-18..=18).contains(&power), ShineUsersError::InvalidOracle); + let normalized = if power >= 0 { + p.checked_mul(10u128.pow(power as u32)) + } else { + Some(p / 10u128.pow((-power) as u32)) + }.ok_or(ShineUsersError::MathOverflow)?; + require!(normalized > 0, ShineUsersError::InvalidOracle); + Ok(normalized) +} + +fn verify_stars_quote(lamports: u64, star_cents: u64, sol_oracle: &AccountInfo, usdt_oracle: &AccountInfo) -> ProgramResult { + require!(star_cents >= 10 && lamports > 0, ShineUsersError::InvalidStars); + let sol_usd = verified_pyth_price(sol_oracle, PYTH_SOL_FEED)?; + let usdt_usd = verified_pyth_price(usdt_oracle, PYTH_USDT_FEED)?; + let actual_num = (lamports as u128).checked_mul(sol_usd).and_then(|v| v.checked_mul(100)) + .ok_or(ShineUsersError::MathOverflow)?; + let den = 1_000_000_000u128.checked_mul(usdt_usd).ok_or(ShineUsersError::MathOverflow)?; + let declared_num = (star_cents as u128).checked_mul(den).ok_or(ShineUsersError::MathOverflow)?; + let difference = actual_num.abs_diff(declared_num); + // |actual - declared| / declared <= 0.005. Avoid intermediate overflow. + require!(difference.checked_mul(200).ok_or(ShineUsersError::MathOverflow)? <= declared_num, + ShineUsersError::StarRateMismatch); + Ok(()) +} + fn process_support_user(program_id: &Pubkey, accounts: &[AccountInfo], args: SupportUserArgs) -> ProgramResult { let mut it = accounts.iter(); let sender = next_account_info(&mut it)?; @@ -838,12 +895,15 @@ fn process_support_user(program_id: &Pubkey, accounts: &[AccountInfo], args: Sup let inflow_vault = next_account_info(&mut it)?; let economy_config = next_account_info(&mut it)?; let system_program_ai = next_account_info(&mut it)?; + let sol_oracle = next_account_info(&mut it)?; + let usdt_oracle = next_account_info(&mut it)?; require!(it.next().is_none(), ShineUsersError::InvalidInstruction); require!(sender.is_signer && sender.is_writable && recipient.is_writable && sender_pda.is_writable && recipient_pda.is_writable, ShineUsersError::InvalidSigner); require_keys_eq!(*system_program_ai.key, system_program::id(), ShineUsersError::InvalidSystemProgram); validate_full_login(&args.sender_login)?; validate_full_login(&args.recipient_login)?; - require!(args.sender_login != args.recipient_login && args.amount_lamports > 0 && args.amount_lamports % 10 == 0, ShineUsersError::InvalidSupport); + require!(args.sender_login != args.recipient_login && args.amount_lamports > 0 && args.amount_star_cents >= 10, ShineUsersError::InvalidSupport); + verify_stars_quote(args.amount_lamports, args.amount_star_cents, sol_oracle, usdt_oracle)?; validate_inflow_vault(inflow_vault)?; validate_users_economy_config_pda(program_id, economy_config)?; require!(!economy_config.is_writable, ShineUsersError::InvalidAccountData); @@ -861,12 +921,14 @@ fn process_support_user(program_id: &Pubkey, accounts: &[AccountInfo], args: Sup require_keys_eq!(sender_key, *sender.key, ShineUsersError::InvalidSigner); require_keys_eq!(recipient_key, *recipient.key, ShineUsersError::InvalidSupport); require!(sender_key != recipient_key, ShineUsersError::InvalidSupport); - let recipient_amount = args.amount_lamports.checked_mul(9).ok_or(ProgramError::from(ShineUsersError::MathOverflow))?.checked_div(10).ok_or(ProgramError::from(ShineUsersError::MathOverflow))?; - let inflow_amount = args.amount_lamports.checked_div(10).ok_or(ProgramError::from(ShineUsersError::MathOverflow))?; + let inflow_amount = args.amount_lamports / 10 + u64::from(args.amount_lamports % 10 != 0); + let recipient_amount = args.amount_lamports - inflow_amount; + let dao_star_cents = args.amount_star_cents / 10 + u64::from(args.amount_star_cents % 10 != 0); + let author_star_cents = args.amount_star_cents - dao_star_cents; let mut sender_stats = read_support_stats(&sender_raw)?; let mut recipient_stats = read_support_stats(&recipient_raw)?; - sender_stats.support_sent = sender_stats.support_sent.checked_add(args.amount_lamports).ok_or(ProgramError::from(ShineUsersError::MathOverflow))?; - recipient_stats.support_received = recipient_stats.support_received.checked_add(recipient_amount).ok_or(ProgramError::from(ShineUsersError::MathOverflow))?; + sender_stats.support_sent = sender_stats.support_sent.checked_add(args.amount_star_cents).ok_or(ProgramError::from(ShineUsersError::MathOverflow))?; + recipient_stats.support_received = recipient_stats.support_received.checked_add(author_star_cents).ok_or(ProgramError::from(ShineUsersError::MathOverflow))?; let sender_data = serialize_record_with_stats(&sender_record, sender_stats)?; let recipient_data = serialize_record_with_stats(&recipient_record, recipient_stats)?; ensure_pda_size_and_rent(sender_pda, sender, system_program_ai, sender_data.len())?; @@ -875,6 +937,8 @@ fn process_support_user(program_id: &Pubkey, accounts: &[AccountInfo], args: Sup transfer_lamports(sender, inflow_vault, system_program_ai, inflow_amount)?; write_pda_exact(sender_pda, &sender_data)?; write_pda_exact(recipient_pda, &recipient_data)?; + solana_program::msg!("SHINE_STARS_V1|USER|{}|{}|{}|{}|{}|{}", args.sender_login, args.recipient_login, + args.amount_lamports, args.amount_star_cents, author_star_cents, dao_star_cents); Ok(()) } @@ -886,11 +950,14 @@ fn process_support_dao(program_id: &Pubkey, accounts: &[AccountInfo], args: Supp let inflow_vault = next_account_info(&mut it)?; let economy_config = next_account_info(&mut it)?; let system_program_ai = next_account_info(&mut it)?; + let sol_oracle = next_account_info(&mut it)?; + let usdt_oracle = next_account_info(&mut it)?; require!(it.next().is_none(), ShineUsersError::InvalidInstruction); require!(sender.is_signer && sender.is_writable && sender_pda.is_writable, ShineUsersError::InvalidSigner); require_keys_eq!(*system_program_ai.key, system_program::id(), ShineUsersError::InvalidSystemProgram); validate_full_login(&args.sender_login)?; - require!(args.amount_lamports > 0, ShineUsersError::InvalidSupport); + require!(args.amount_lamports > 0 && args.amount_star_cents >= 10, ShineUsersError::InvalidSupport); + verify_stars_quote(args.amount_lamports, args.amount_star_cents, sol_oracle, usdt_oracle)?; validate_inflow_vault(inflow_vault)?; validate_users_economy_config_pda(program_id, economy_config)?; require!(!economy_config.is_writable, ShineUsersError::InvalidAccountData); @@ -902,11 +969,14 @@ fn process_support_dao(program_id: &Pubkey, accounts: &[AccountInfo], args: Supp require!(record.login == args.sender_login, ShineUsersError::InvalidRecordData); require_keys_eq!(record.active_fork()?.blockchain_key, *sender.key, ShineUsersError::InvalidSigner); let mut stats = read_support_stats(&raw)?; - stats.dao_direct = stats.dao_direct.checked_add(args.amount_lamports).ok_or(ProgramError::from(ShineUsersError::MathOverflow))?; + stats.dao_direct = stats.dao_direct.checked_add(args.amount_star_cents).ok_or(ProgramError::from(ShineUsersError::MathOverflow))?; let data = serialize_record_with_stats(&record, stats)?; ensure_pda_size_and_rent(sender_pda, sender, system_program_ai, data.len())?; transfer_lamports(sender, inflow_vault, system_program_ai, args.amount_lamports)?; - write_pda_exact(sender_pda, &data) + write_pda_exact(sender_pda, &data)?; + solana_program::msg!("SHINE_STARS_V1|DAO|{}|-|{}|{}|0|{}", args.sender_login, + args.amount_lamports, args.amount_star_cents, args.amount_star_cents); + Ok(()) } fn process_close_legacy_user_pda(program_id: &Pubkey, accounts: &[AccountInfo], args: CloseLegacyUserPdaArgs) -> ProgramResult { @@ -1166,6 +1236,9 @@ fn read_support_stats(raw: &[u8]) -> Result { require!(raw.len() >= 9, ShineUsersError::InvalidRecordData); let record_len = u16::from_le_bytes([raw[7], raw[8]]) as usize; if record_len >= raw.len() || raw[record_len] == 0 { return Ok(SupportStats::default()); } + // Тестовый переход: прежние lamports-счётчики v1 намеренно забываются. + // При следующей записи PDA они заменяются нулевыми Stars v2. + if raw[record_len] == 1 { return Ok(SupportStats::default()); } require!(raw[record_len] == SUPPORT_STATS_VERSION, ShineUsersError::UnsupportedSupportStats); let end = record_len.checked_add(SUPPORT_STATS_LEN).ok_or(ProgramError::from(ShineUsersError::MathOverflow))?; require!(end <= raw.len(), ShineUsersError::InvalidRecordLength); @@ -1499,7 +1572,7 @@ mod support_stats_tests { use super::*; #[test] - fn v0_and_v1_support_stats_are_read_without_touching_record_len() { + fn legacy_support_stats_are_reset_and_v2_is_supported() { let mut v0 = vec![0u8; 100]; v0[7..9].copy_from_slice(&80u16.to_le_bytes()); assert_eq!(read_support_stats(&v0).unwrap(), SupportStats::default()); @@ -1507,10 +1580,12 @@ mod support_stats_tests { v1[80] = 1; v1[81..89].copy_from_slice(&100u64.to_le_bytes()); v1[89..97].copy_from_slice(&90u64.to_le_bytes()); - // Отдельный полный буфер проверяет нормальный v1; укороченный v1 обязан отвергаться. - assert!(read_support_stats(&v1).is_err()); + // Статистика v1 игнорируется: это lamports, не Stars. + assert_eq!(read_support_stats(&v1).unwrap(), SupportStats::default()); v1.resize(105, 0); v1[97..105].copy_from_slice(&7u64.to_le_bytes()); + assert_eq!(read_support_stats(&v1).unwrap(), SupportStats::default()); + v1[80] = 2; assert_eq!(read_support_stats(&v1).unwrap(), SupportStats { support_sent: 100, support_received: 90, dao_direct: 7 }); } }