Fix governance bugs

apps/src/lib/node/ledger/shell/finalize_block.rs

@@ -800,17 +800,7 @@ where
         let pgf_pd_rate =
             pgf_parameters.pgf_inflation_rate / Dec::from(epochs_per_year);
         let pgf_inflation = Dec::from(total_tokens) * pgf_pd_rate;
-
-        let stewards = pgf::get_stewards(&self.wl_storage)?;
-        let pgf_stewards_pd_rate =
-            pgf_parameters.stewards_inflation_rate / Dec::from(epochs_per_year);
-        let pgf_steward_inflation =
-            Dec::from(total_tokens) * pgf_stewards_pd_rate;
-        let total_pgf_stewards_inflation =
-            pgf_steward_inflation * Dec::from(stewards.len());
-
-        let pgf_inflation_amount =
-            token::Amount::from(pgf_inflation + total_pgf_stewards_inflation);
+        let pgf_inflation_amount = token::Amount::from(pgf_inflation);
 
         credit_tokens(
             &mut self.wl_storage,
@@ -830,29 +820,36 @@ where
         pgf_fundings.sort_by(|a, b| a.id.cmp(&b.id));
 
         for funding in pgf_fundings {
-            if credit_tokens(
+            if storage_api::token::transfer(
                 &mut self.wl_storage,
                 &staking_token,
+                &pgf_address,
                 &funding.detail.target,
                 funding.detail.amount,
             )
             .is_ok()
             {
                 tracing::info!(
-                    "Minted {} tokens for {} project.",
+                    "Paying {} tokens for {} project.",
                     funding.detail.amount.to_string_native(),
                     &funding.detail.target,
                 );
             } else {
                 tracing::warn!(
-                    "Failed Minting {} tokens for {} project.",
+                    "Failed to pay {} tokens for {} project.",
                     funding.detail.amount.to_string_native(),
                     &funding.detail.target,
                 );
             }
         }
 
         // Pgf steward inflation
+        let stewards = pgf::get_stewards(&self.wl_storage)?;
+        let pgf_stewards_pd_rate =
+            pgf_parameters.stewards_inflation_rate / Dec::from(epochs_per_year);
+        let pgf_steward_inflation =
+            Dec::from(total_tokens) * pgf_stewards_pd_rate;
+
         for steward in stewards {
             for (address, percentage) in steward.reward_distribution {
                 let pgf_steward_reward = pgf_steward_inflation

proof_of_stake/src/lib.rs

@@ -734,7 +734,7 @@ pub fn is_delegator<S>(
     epoch: Option<namada_core::types::storage::Epoch>,
 ) -> storage_api::Result<bool>
 where
-    S: StorageRead + StorageWrite,
+    S: StorageRead,
 {
     let prefix = bonds_for_source_prefix(address);
     match epoch {

shared/src/ledger/governance/mod.rs

@@ -671,19 +671,13 @@ where
         address: &Address,
         delegation_address: &Address,
     ) -> Result<bool> {
-        let bond_handle = pos::namada_proof_of_stake::bond_handle(
-            address,
-            delegation_address,
-        );
-        let params =
-            pos::namada_proof_of_stake::read_pos_params(&self.ctx.pre())?;
-        let bond = bond_handle.get_sum(&self.ctx.pre(), epoch, &params)?;
-
-        if bond.is_some() && verifiers.contains(address) {
-            Ok(true)
-        } else {
-            Ok(false)
-        }
+        Ok(address != delegation_address
+            && verifiers.contains(address)
+            && pos::namada_proof_of_stake::is_delegator(
+                &self.ctx.pre(),
+                address,
+                Some(epoch),
+            )?)
     }
 }