From 32bc2c9dc3b246028aaf4e93bc50146c640d8976 Mon Sep 17 00:00:00 2001 From: AidarKC Date: Sat, 16 May 2026 18:36:36 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D1=82=D1=8C=20=D1=84?= =?UTF-8?q?=D0=B8=D0=BA=D1=81=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD?= =?UTF-8?q?=D0=BE=D0=B3=D0=BE=20=D0=BC=D0=B5=D0=BD=D0=B5=D0=B4=D0=B6=D0=B5?= =?UTF-8?q?=D1=80=D0=B0=20=D0=B8=D0=B7=20config=20=D0=B8=20=D1=85=D1=80?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=82=D1=8C=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA?= =?UTF-8?q?=D0=BE=20DAO-=D1=83=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D1=8F=D0=B5?= =?UTF-8?q?=D0=BC=D1=8B=D1=85=20=D0=BC=D0=B5=D0=BD=D0=B5=D0=B4=D0=B6=D0=B5?= =?UTF-8?q?=D1=80=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shine/programs/common/src/deploy_config.rs | 13 ++++++++++--- shine/programs/shine_payments/src/lib.rs | 5 ----- shine/programs/shine_payments/src/settings.rs | 2 -- shine/programs/shine_payments/web/admin_tools.html | 4 +--- shine/programs/shine_payments/web/buy_ticket.html | 3 +-- shine/programs/shine_payments/web/dao_tools.html | 3 +-- shine/programs/shine_payments/web/track_ticket.html | 3 +-- 7 files changed, 14 insertions(+), 19 deletions(-) diff --git a/shine/programs/common/src/deploy_config.rs b/shine/programs/common/src/deploy_config.rs index 2a088af..7a6a4ca 100644 --- a/shine/programs/common/src/deploy_config.rs +++ b/shine/programs/common/src/deploy_config.rs @@ -1,6 +1,16 @@ //! Единый деплой-конфиг проекта SHINE. //! Здесь хранятся адреса и параметры, которые зависят от окружения деплоя. +// ========================= +// Program IDs +// ========================= + +/// `SHINE_PAYMENTS_PROGRAM_ID` — адрес программы `shine_payments` для текущего окружения. +pub const SHINE_PAYMENTS_PROGRAM_ID: &str = "m48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR"; + +/// `SHINE_USERS_PROGRAM_ID` — адрес программы `shine_users` для текущего окружения. +pub const SHINE_USERS_PROGRAM_ID: &str = "FZS1YctoeEhCkZ5VTjsysUFAXR8CqxYztcLboXcg2Rpm"; + // ========================= // DAO / роли управления // ========================= @@ -11,9 +21,6 @@ pub const DAO_AUTHORITY: &str = "FUc28vNixp7F3nnkpGVt6nuJbgvJ4429v4B5wS52Df6P"; /// `DAO_TREASURY_WALLET` — кошелек казны DAO для поступления DAO-части выплат в `shine_payments`. pub const DAO_TREASURY_WALLET: &str = "FUc28vNixp7F3nnkpGVt6nuJbgvJ4429v4B5wS52Df6P"; -/// `MANAGER_WALLET` — сервисный менеджерский кошелек по умолчанию для `shine_payments`. -pub const MANAGER_WALLET: &str = "4yzHKs2zFXpyqqCETe8KpAs4xhEo4QhJ2ybyTgRZphZv"; - // ========================= // Комиссии / получатели // ========================= diff --git a/shine/programs/shine_payments/src/lib.rs b/shine/programs/shine_payments/src/lib.rs index 874b6cb..a140711 100644 --- a/shine/programs/shine_payments/src/lib.rs +++ b/shine/programs/shine_payments/src/lib.rs @@ -34,15 +34,11 @@ pub mod shine_payments { let dao_wallet = Pubkey::from_str(settings::DAO_WALLET) .map_err(|_| error!(PaymentsError::InvalidSettingsWallet))?; - let manager_wallet = Pubkey::from_str(settings::MANAGER_WALLET) - .map_err(|_| error!(PaymentsError::InvalidSettingsWallet))?; - let system_program_ai = ctx.accounts.system_program.to_account_info(); let config = ConfigState { version: 1, dao_wallet, - manager_wallet, inflow_vault: ctx.accounts.inflow_vault_pda.key(), }; create_and_store_state( @@ -737,7 +733,6 @@ pub struct ChangeTicketRecipientArgs { pub struct ConfigState { pub version: u8, pub dao_wallet: Pubkey, - pub manager_wallet: Pubkey, pub inflow_vault: Pubkey, } diff --git a/shine/programs/shine_payments/src/settings.rs b/shine/programs/shine_payments/src/settings.rs index 4d6582a..30d2fe3 100644 --- a/shine/programs/shine_payments/src/settings.rs +++ b/shine/programs/shine_payments/src/settings.rs @@ -52,5 +52,3 @@ pub const PYTH_SOL_USD_ACCOUNT: &str = deploy_config::PYTH_SOL_USD_ACCOUNT; /// `DAO_WALLET` — адрес кошелька DAO-казны для `shine_payments` (берется из общего deploy-конфига). pub const DAO_WALLET: &str = deploy_config::DAO_TREASURY_WALLET; -/// `MANAGER_WALLET` — адрес менеджерского кошелька по умолчанию (берется из общего deploy-конфига). -pub const MANAGER_WALLET: &str = deploy_config::MANAGER_WALLET; diff --git a/shine/programs/shine_payments/web/admin_tools.html b/shine/programs/shine_payments/web/admin_tools.html index b3ff0ba..926ea7c 100644 --- a/shine/programs/shine_payments/web/admin_tools.html +++ b/shine/programs/shine_payments/web/admin_tools.html @@ -180,9 +180,8 @@ let o = 0; const version = data[o++]; const dao = new solanaWeb3.PublicKey(data.slice(o, o + 32)); o += 32; - const manager = new solanaWeb3.PublicKey(data.slice(o, o + 32)); o += 32; const inflow = new solanaWeb3.PublicKey(data.slice(o, o + 32)); o += 32; - return { version, dao, manager, inflow }; + return { version, dao, inflow }; } function parseCoef(data) { let o = 0; @@ -313,7 +312,6 @@
Сейчас это тестовый DAO-кошелек. В production здесь будет адрес реального DAO.
Inflow vault: ${core.config.inflow.toBase58()}
Inflow vault — входящий PDA-кошелек выплат программы.
-
Manager (для справки): ${core.config.manager.toBase58()}
Награда за шаг: ${lamportsToSolStr(core.coef.reward)} SOL
Коэффициент: ${coefText}, лимит: ${centsToUsdStr(core.coef.limitUsdCents)} USD
Осталось лимита для покупки Q1: ${centsToUsdStr(limitRemain)} USD
diff --git a/shine/programs/shine_payments/web/buy_ticket.html b/shine/programs/shine_payments/web/buy_ticket.html index 105086c..a66969d 100644 --- a/shine/programs/shine_payments/web/buy_ticket.html +++ b/shine/programs/shine_payments/web/buy_ticket.html @@ -187,9 +187,8 @@ let o = 0; const version = data[o++]; const dao = new solanaWeb3.PublicKey(data.slice(o, o + 32)).toBase58(); o += 32; - const manager = new solanaWeb3.PublicKey(data.slice(o, o + 32)).toBase58(); o += 32; const inflow = new solanaWeb3.PublicKey(data.slice(o, o + 32)).toBase58(); o += 32; - return { version, dao, manager, inflow }; + return { version, dao, inflow }; } function parseCoef(data) { let o = 0; diff --git a/shine/programs/shine_payments/web/dao_tools.html b/shine/programs/shine_payments/web/dao_tools.html index 98c992d..fec87d3 100644 --- a/shine/programs/shine_payments/web/dao_tools.html +++ b/shine/programs/shine_payments/web/dao_tools.html @@ -138,9 +138,8 @@ let o = 0; const version = data[o++]; const dao = new solanaWeb3.PublicKey(data.slice(o, o + 32)); o += 32; - const manager = new solanaWeb3.PublicKey(data.slice(o, o + 32)); o += 32; const inflow = new solanaWeb3.PublicKey(data.slice(o, o + 32)); o += 32; - return { version, dao, manager, inflow }; + return { version, dao, inflow }; } function parseManagerAllowance(data) { let o = 0; diff --git a/shine/programs/shine_payments/web/track_ticket.html b/shine/programs/shine_payments/web/track_ticket.html index 0475d1d..a0c9648 100644 --- a/shine/programs/shine_payments/web/track_ticket.html +++ b/shine/programs/shine_payments/web/track_ticket.html @@ -165,9 +165,8 @@ let o = 0; const version = data[o++]; const dao = new solanaWeb3.PublicKey(data.slice(o, o + 32)); o += 32; - const manager = new solanaWeb3.PublicKey(data.slice(o, o + 32)); o += 32; const inflow = new solanaWeb3.PublicKey(data.slice(o, o + 32)); o += 32; - return { version, dao, manager, inflow }; + return { version, dao, inflow }; } function parseCoef(data) { let o = 0;