diff --git a/Dev_Docs/Pending_Features/2026-06-06_1659_shine_payments_e2e_перепись_и_q3.md b/Dev_Docs/Pending_Features/2026-06-06_1659_shine_payments_e2e_перепись_и_q3.md index db8fa57..1436bc6 100644 --- a/Dev_Docs/Pending_Features/2026-06-06_1659_shine_payments_e2e_перепись_и_q3.md +++ b/Dev_Docs/Pending_Features/2026-06-06_1659_shine_payments_e2e_перепись_и_q3.md @@ -182,4 +182,29 @@ ## Статус -- `pending` +- `done` + +## Итог выполнения + +- новый `shine_payments` задеплоен в devnet с `program id`: + - `c4yTa4JT9EtQDCBX9LmWFK6T2gp4JGsuymFbom2EudW` +- старый `shine_payments`: + - `m48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR` + - закрыт, лампорты возвращены на базовый DAO-кошелёк +- HTML UI переведён на новый `program id` +- подтверждены: + - `init` + - `buy_ticket_usd` + - `buy_ticket_sol` + - `grant_manager_limits` + - `manager_add_ticket` для `Q1/Q2/Q3` + - `change_ticket_recipient` + - `update_coef_limit` + - `step_payout` по порядку `Q1 -> Q2 -> Q3` + - повторный возврат приоритета в `Q1` после новой покупки +- итоговые агрегаты очередей: + - `Q1 total=4, paid=4, sum_total=780, sum_paid=780` + - `Q2 total=1, paid=1, sum_total=60, sum_paid=60` + - `Q3 total=1, paid=1, sum_total=70, sum_paid=70` +- временные тестовые кошельки собраны обратно в базовый DAO-кошелёк +- в `inflow_vault` остался только rent-минимум PDA diff --git a/Dev_Docs/Solana_Architecture/README.md b/Dev_Docs/Solana_Architecture/README.md index 5ac7041..34b0257 100644 --- a/Dev_Docs/Solana_Architecture/README.md +++ b/Dev_Docs/Solana_Architecture/README.md @@ -48,7 +48,7 @@ DAO в текущем виде не является отдельной Anchor- | --- | --- | | `shine_login_guard` | `3xkopA7cXagxzMFrKdv3NCBfV6BKiRJCk69kr27M2sRo` | | `shine_users` | `FZS1YctoeEhCkZ5VTjsysUFAXR8CqxYztcLboXcg2Rpm` | -| `shine_payments` | `m48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR` | +| `shine_payments` | `c4yTa4JT9EtQDCBX9LmWFK6T2gp4JGsuymFbom2EudW` | Если эти адреса меняются, нужно синхронно обновить: diff --git a/Dev_Docs/Solana_Architecture/details/accounts_and_money_flow.md b/Dev_Docs/Solana_Architecture/details/accounts_and_money_flow.md index 1f97c43..0aafaeb 100644 --- a/Dev_Docs/Solana_Architecture/details/accounts_and_money_flow.md +++ b/Dev_Docs/Solana_Architecture/details/accounts_and_money_flow.md @@ -28,7 +28,7 @@ | --- | --- | | `SHINE_LOGIN_GUARD_PROGRAM_ID` | `3xkopA7cXagxzMFrKdv3NCBfV6BKiRJCk69kr27M2sRo` | | `SHINE_USERS_PROGRAM_ID` | `FZS1YctoeEhCkZ5VTjsysUFAXR8CqxYztcLboXcg2Rpm` | -| `SHINE_PAYMENTS_PROGRAM_ID` | `m48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR` | +| `SHINE_PAYMENTS_PROGRAM_ID` | `c4yTa4JT9EtQDCBX9LmWFK6T2gp4JGsuymFbom2EudW` | | `DAO_AUTHORITY` | `FUc28vNixp7F3nnkpGVt6nuJbgvJ4429v4B5wS52Df6P` | | `DAO_TREASURY_WALLET` | `FUc28vNixp7F3nnkpGVt6nuJbgvJ4429v4B5wS52Df6P` | diff --git a/Dev_Docs/Инициализация_Solana_регистрации/README.md b/Dev_Docs/Инициализация_Solana_регистрации/README.md index 72375a5..98b91d1 100644 --- a/Dev_Docs/Инициализация_Solana_регистрации/README.md +++ b/Dev_Docs/Инициализация_Solana_регистрации/README.md @@ -16,7 +16,7 @@ - `shine_login_guard`: `3xkopA7cXagxzMFrKdv3NCBfV6BKiRJCk69kr27M2sRo` - `shine_payments`: - `m48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR` + `c4yTa4JT9EtQDCBX9LmWFK6T2gp4JGsuymFbom2EudW` ## Подтверждение деплоя diff --git a/SHiNE-server/AGENTS.md b/SHiNE-server/AGENTS.md index 61ffe64..5d319b9 100644 --- a/SHiNE-server/AGENTS.md +++ b/SHiNE-server/AGENTS.md @@ -43,7 +43,7 @@ shine-UI/server-ui.html Актуальные адреса программ Solana (devnet): - `shine_users`: `FZS1YctoeEhCkZ5VTjsysUFAXR8CqxYztcLboXcg2Rpm` -- `shine_payments`: `m48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR` +- `shine_payments`: `c4yTa4JT9EtQDCBX9LmWFK6T2gp4JGsuymFbom2EudW` Подробнее: `Dev_Docs/Инициализация_Solana_регистрации/README.md` diff --git a/SHiNE-server/shine-server-config/src/main/java/utils/config/SolanaProgramsConfig.java b/SHiNE-server/shine-server-config/src/main/java/utils/config/SolanaProgramsConfig.java index f238da6..4d6fdbc 100644 --- a/SHiNE-server/shine-server-config/src/main/java/utils/config/SolanaProgramsConfig.java +++ b/SHiNE-server/shine-server-config/src/main/java/utils/config/SolanaProgramsConfig.java @@ -16,6 +16,6 @@ public final class SolanaProgramsConfig { // Отдельно фиксируем адреса связанной инфраструктуры, чтобы UI/сервер ссылались одинаково. public static final String SHINE_LOGIN_GUARD_PROGRAM_ID = "3xkopA7cXagxzMFrKdv3NCBfV6BKiRJCk69kr27M2sRo"; - public static final String SHINE_PAYMENTS_PROGRAM_ID = "m48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR"; + public static final String SHINE_PAYMENTS_PROGRAM_ID = "c4yTa4JT9EtQDCBX9LmWFK6T2gp4JGsuymFbom2EudW"; } diff --git a/VERSION.properties b/VERSION.properties index 3476427..4713d7d 100644 --- a/VERSION.properties +++ b/VERSION.properties @@ -1,2 +1,2 @@ -client.version=1.2.131 -server.version=1.2.123 +client.version=1.2.132 +server.version=1.2.124 diff --git a/shine-UI/js/solana-programs.js b/shine-UI/js/solana-programs.js index 8c84213..32111f7 100644 --- a/shine-UI/js/solana-programs.js +++ b/shine-UI/js/solana-programs.js @@ -5,4 +5,4 @@ export const SOLANA_ENDPOINT_DEFAULT = 'https://api.devnet.solana.com'; export const SHINE_USERS_PROGRAM_ID = 'FZS1YctoeEhCkZ5VTjsysUFAXR8CqxYztcLboXcg2Rpm'; export const SHINE_USERS_ECONOMY_CONFIG_SEED = 'shine_users_economy_config'; export const SHINE_LOGIN_GUARD_PROGRAM_ID = '3xkopA7cXagxzMFrKdv3NCBfV6BKiRJCk69kr27M2sRo'; -export const SHINE_PAYMENTS_PROGRAM_ID = 'm48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR'; +export const SHINE_PAYMENTS_PROGRAM_ID = 'c4yTa4JT9EtQDCBX9LmWFK6T2gp4JGsuymFbom2EudW'; diff --git a/shine-solana/shine/Anchor.toml b/shine-solana/shine/Anchor.toml index 910a504..11b496c 100644 --- a/shine-solana/shine/Anchor.toml +++ b/shine-solana/shine/Anchor.toml @@ -6,12 +6,12 @@ resolution = true skip-lint = false [programs.devnet] -shine_payments = "m48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR" +shine_payments = "c4yTa4JT9EtQDCBX9LmWFK6T2gp4JGsuymFbom2EudW" shine_users = "FZS1YctoeEhCkZ5VTjsysUFAXR8CqxYztcLboXcg2Rpm" shine_login_guard = "3xkopA7cXagxzMFrKdv3NCBfV6BKiRJCk69kr27M2sRo" [programs.localnet] -shine_payments = "m48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR" +shine_payments = "c4yTa4JT9EtQDCBX9LmWFK6T2gp4JGsuymFbom2EudW" shine_users = "FZS1YctoeEhCkZ5VTjsysUFAXR8CqxYztcLboXcg2Rpm" shine_login_guard = "3xkopA7cXagxzMFrKdv3NCBfV6BKiRJCk69kr27M2sRo" diff --git a/shine-solana/shine/build.gradle b/shine-solana/shine/build.gradle index 1f6c34b..c0408e3 100644 --- a/shine-solana/shine/build.gradle +++ b/shine-solana/shine/build.gradle @@ -46,5 +46,5 @@ tasks.register("checkUiRemote", Exec) { "grep -n 'test-solana-tickets.shineup.me\\|test-solana-tickets.shiningpeople.ru' /home/player/SHiNE/caddy/Caddyfile; " + "echo; " + "echo 'Program ID в загруженных html:'; " + - "grep -R -n 'm48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR' /home/player/sites/test-solana-tickets.shineup.me/*.html" + "grep -R -n 'c4yTa4JT9EtQDCBX9LmWFK6T2gp4JGsuymFbom2EudW' /home/player/sites/test-solana-tickets.shineup.me/*.html" } diff --git a/shine-solana/shine/doc/programs/shine_payments.md b/shine-solana/shine/doc/programs/shine_payments.md index d8a15d1..912da5e 100644 --- a/shine-solana/shine/doc/programs/shine_payments.md +++ b/shine-solana/shine/doc/programs/shine_payments.md @@ -22,7 +22,7 @@ Текущий program id: -- `m48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR` +- `c4yTa4JT9EtQDCBX9LmWFK6T2gp4JGsuymFbom2EudW` ## 2. Основная модель diff --git a/shine-solana/shine/programs/common/src/deploy_config.rs b/shine-solana/shine/programs/common/src/deploy_config.rs index 54f021c..95a7540 100644 --- a/shine-solana/shine/programs/common/src/deploy_config.rs +++ b/shine-solana/shine/programs/common/src/deploy_config.rs @@ -6,7 +6,7 @@ // ========================= /// `SHINE_PAYMENTS_PROGRAM_ID` — адрес программы `shine_payments` для текущего окружения. -pub const SHINE_PAYMENTS_PROGRAM_ID: &str = "m48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR"; +pub const SHINE_PAYMENTS_PROGRAM_ID: &str = "c4yTa4JT9EtQDCBX9LmWFK6T2gp4JGsuymFbom2EudW"; /// `SHINE_USERS_PROGRAM_ID` — адрес программы `shine_users` для текущего окружения. pub const SHINE_USERS_PROGRAM_ID: &str = "FZS1YctoeEhCkZ5VTjsysUFAXR8CqxYztcLboXcg2Rpm"; diff --git a/shine-solana/shine/programs/shine_payments/src/lib.rs b/shine-solana/shine/programs/shine_payments/src/lib.rs index eb6fe83..bfbb121 100644 --- a/shine-solana/shine/programs/shine_payments/src/lib.rs +++ b/shine-solana/shine/programs/shine_payments/src/lib.rs @@ -14,7 +14,7 @@ use std::str::FromStr; pub mod settings; -solana_program::declare_id!("m48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR"); +solana_program::declare_id!("c4yTa4JT9EtQDCBX9LmWFK6T2gp4JGsuymFbom2EudW"); entrypoint!(process_instruction); const IX_INIT: u8 = 1; diff --git a/shine-solana/shine/programs/shine_payments/web/admin_tools.html b/shine-solana/shine/programs/shine_payments/web/admin_tools.html index cb72d5b..91eac12 100644 --- a/shine-solana/shine/programs/shine_payments/web/admin_tools.html +++ b/shine-solana/shine/programs/shine_payments/web/admin_tools.html @@ -110,7 +110,7 @@