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 @@
${core.config.inflow.toBase58()}${core.config.manager.toBase58()}