Governance: Remove FlagTransactionError instruction (#6365)

chore: Remove FlagTransactionError instruction

Author: SebastianBor

governance/program/src/instruction.rs

@@ -412,19 +412,9 @@ pub enum GovernanceInstruction {
         config: GovernanceConfig,
     },
 
-    /// Flags a transaction and its parent Proposal with error status
-    /// It can be used by Proposal owner in case the transaction is permanently
-    /// broken and can't be executed.
-    /// Note: This instruction is a workaround because currently it's not
-    /// possible to catch errors from CPI calls and the Governance program has
-    /// no way to know when instruction failed and flag it automatically.
-    ///
-    ///   0. `[writable]` Proposal account
-    ///   1. `[]` TokenOwnerRecord account of the Proposal owner
-    ///   2. `[signer]` Governance Authority (Token Owner or Governance
-    ///      Delegate)
-    ///   3. `[writable]` ProposalTransaction account to flag
-    FlagTransactionError,
+    /// Legacy FlagTransactionError instruction
+    /// Exists for backwards-compatibility
+    Legacy5,
 
     /// Sets new Realm authority
     ///
@@ -1291,31 +1281,6 @@ pub fn set_governance_config(
     }
 }
 
-/// Creates FlagTransactionError instruction
-pub fn flag_transaction_error(
-    program_id: &Pubkey,
-    // Accounts
-    proposal: &Pubkey,
-    token_owner_record: &Pubkey,
-    governance_authority: &Pubkey,
-    proposal_transaction: &Pubkey,
-) -> Instruction {
-    let accounts = vec![
-        AccountMeta::new(*proposal, false),
-        AccountMeta::new_readonly(*token_owner_record, false),
-        AccountMeta::new_readonly(*governance_authority, true),
-        AccountMeta::new(*proposal_transaction, false),
-    ];
-
-    let instruction = GovernanceInstruction::FlagTransactionError {};
-
-    Instruction {
-        program_id: *program_id,
-        accounts,
-        data: borsh::to_vec(&instruction).unwrap(),
-    }
-}
-
 /// Creates SetRealmAuthority instruction
 pub fn set_realm_authority(
     program_id: &Pubkey,

governance/program/src/processor/mod.rs

@@ -15,7 +15,7 @@ mod process_create_token_owner_record;
 mod process_deposit_governing_tokens;
 mod process_execute_transaction;
 mod process_finalize_vote;
-mod process_flag_transaction_error;
+
 mod process_insert_transaction;
 mod process_refund_proposal_deposit;
 mod process_relinquish_token_owner_record_locks;
@@ -48,7 +48,6 @@ use {
     process_deposit_governing_tokens::*,
     process_execute_transaction::*,
     process_finalize_vote::*,
-    process_flag_transaction_error::*,
     process_insert_transaction::*,
     process_refund_proposal_deposit::*,
     process_relinquish_token_owner_record_locks::*,
@@ -145,7 +144,8 @@ pub fn process_instruction(
         GovernanceInstruction::Legacy1
         | GovernanceInstruction::Legacy2
         | GovernanceInstruction::Legacy3
-        | GovernanceInstruction::Legacy4 => {
+        | GovernanceInstruction::Legacy4
+        | GovernanceInstruction::Legacy5 => {
             Err(GovernanceError::InstructionDeprecated.into()) // No-op
         }
         GovernanceInstruction::SignOffProposal {} => {
@@ -184,9 +184,6 @@ pub fn process_instruction(
             process_set_governance_config(program_id, accounts, config)
         }
 
-        GovernanceInstruction::FlagTransactionError {} => {
-            process_flag_transaction_error(program_id, accounts)
-        }
         GovernanceInstruction::SetRealmAuthority { action } => {
             process_set_realm_authority(program_id, accounts, action)
         }