Skip to content

changes admin of administrative instructions inside futarchy #417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
R-K-H merged 1 commit into from
Feb 4, 2026
Merged

changes admin of administrative instructions inside futarchy #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions programs/futarchy/src/instructions/admin_approve_execute_multisig_proposal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use super::*;

pub mod metadao_multisig_vault {
pub mod admin {
use anchor_lang::prelude::declare_id;

// MetaDAO-controlled admin - cannot be a Squads signer because of reentrancy blocks set up by Squads
declare_id!("tSTp6B6kE9o6ZaTmHm2ZwnJBBtgd3x112tapxFhmBEQ");
// MetaDAO-controlled admin - cannot be a Squads signer because of reentrancy
declare_id!("CWGawadYU8CzRVBecnJymNw97H7E3ndDinV5sMzesgY2");
}

#[derive(Accounts)]
Expand Down Expand Up @@ -54,11 +54,7 @@ pub struct AdminApproveExecuteMultisigProposal<'info> {
impl<'info, 'c: 'info> AdminApproveExecuteMultisigProposal<'info> {
pub fn validate(&self) -> Result<()> {
#[cfg(feature = "production")]
require_keys_eq!(
self.admin.key(),
metadao_multisig_vault::ID,
FutarchyError::InvalidAdmin
);
require_keys_eq!(self.admin.key(), admin::ID, FutarchyError::InvalidAdmin);

if !matches!(self.dao.amm.state, PoolState::Spot { .. }) {
return Err(FutarchyError::PoolNotInSpotState.into());
Expand Down
2 changes: 1 addition & 1 deletion programs/futarchy/src/instructions/admin_remove_proposal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use super::*;

pub mod admin {
use anchor_lang::prelude::declare_id;
declare_id!("tSTp6B6kE9o6ZaTmHm2ZwnJBBtgd3x112tapxFhmBEQ");
declare_id!("CWGawadYU8CzRVBecnJymNw97H7E3ndDinV5sMzesgY2");
}

#[derive(Accounts)]
Expand Down
Loading