Merge pull request #424 from namada-net/refactor-v3

refactor shared structs, api responses

Author: Fraccaman

chain/src/config.rs

@@ -1,20 +1,5 @@
-use core::fmt;
-use std::fmt::Display;
-
 use shared::log_config::LogConfig;
 
-#[derive(clap::ValueEnum, Clone, Debug, Copy)]
-pub enum CargoEnv {
-    Development,
-    Production,
-}
-
-impl Display for CargoEnv {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{:?}", self)
-    }
-}
-
 #[derive(clap::Parser)]
 pub struct AppConfig {
     #[clap(long, env)]

chain/src/main.rs

@@ -302,6 +302,14 @@ async fn crawling_fn(
         })
     });
 
+    let masp_reward_rates = if new_epoch {
+        namada_service::get_masp_rates(&client)
+            .await
+            .into_rpc_error()?
+    } else {
+        vec![]
+    };
+
     tracing::info!(
         block = block_height,
         txs = block.transactions.len(),
@@ -319,7 +327,8 @@ async fn crawling_fn(
         namada_service::query_native_addresses_balance_change(Token::Native(
             native_token.clone(),
         ));
-    let addresses = block.addresses_with_balance_change(&native_token);
+    let addresses =
+        block.addresses_with_balance_change(&native_token, &ibc_tokens);
     let all_changed_tokens_supply = addresses
         .iter()
         .map(|bc| bc.token.clone())
@@ -597,6 +606,11 @@ async fn crawling_fn(
                     revealed_pks,
                 )?;
 
+                repository::masp::insert_masp_rates(
+                    transaction_conn,
+                    masp_reward_rates,
+                )?;
+
                 if should_update_crawler_state {
                     repository::crawler_state::upsert_crawler_state(
                         transaction_conn,
@@ -742,6 +756,10 @@ async fn try_initial_query(
     .await
     .into_rpc_error()?;
 
+    let masp_reward_rates = namada_service::get_masp_rates(client)
+        .await
+        .into_rpc_error()?;
+
     let timestamp = DateTimeUtc::now().0.timestamp();
 
     let crawler_state = ChainCrawlerState {
@@ -807,6 +825,11 @@ async fn try_initial_query(
                     redelegations,
                 )?;
 
+                repository::masp::insert_masp_rates(
+                    transaction_conn,
+                    masp_reward_rates,
+                )?;
+
                 repository::crawler_state::upsert_crawler_state(
                     transaction_conn,
                     crawler_state,

chain/src/repository/masp.rs

@@ -0,0 +1,35 @@
+use anyhow::Context;
+use diesel::upsert::excluded;
+use diesel::{ExpressionMethods, PgConnection, RunQueryDsl};
+use orm::masp::MaspRewardDataInsertDb;
+use orm::schema::masp_rates;
+use shared::masp::MaspRewardData;
+
+pub fn insert_masp_rates(
+    transaction_conn: &mut PgConnection,
+    masp_reward_data: Vec<MaspRewardData>,
+) -> anyhow::Result<()> {
+    diesel::insert_into(masp_rates::table)
+        .values(
+            masp_reward_data
+                .into_iter()
+                .map(MaspRewardDataInsertDb::from)
+                .collect::<Vec<_>>(),
+        )
+        .on_conflict(masp_rates::columns::token)
+        .do_update()
+        .set((
+            masp_rates::columns::max_reward_rate
+                .eq(excluded(masp_rates::columns::max_reward_rate)),
+            masp_rates::columns::kp_gain
+                .eq(excluded(masp_rates::columns::kp_gain)),
+            masp_rates::columns::kd_gain
+                .eq(excluded(masp_rates::columns::kd_gain)),
+            masp_rates::columns::locked_amount_target
+                .eq(excluded(masp_rates::columns::locked_amount_target)),
+        ))
+        .execute(transaction_conn)
+        .context("Failed to update masp rates in db")?;
+
+    Ok(())
+}

chain/src/repository/mod.rs

@@ -3,6 +3,7 @@ pub mod block;
 pub mod cometbft;
 pub mod crawler_state;
 pub mod gov;
+pub mod masp;
 pub mod pgf;
 pub mod pos;
 pub mod revealed_pk;

chain/src/services/namada.rs

@@ -24,6 +24,7 @@ use shared::balance::{Amount, Balance, Balances, TokenSupply};
 use shared::block::{BlockHeight, Epoch};
 use shared::checksums::Checksums;
 use shared::id::Id;
+use shared::masp::MaspRewardData;
 use shared::pos::{
     Bond, BondAddresses, Bonds, Redelegation, Unbond, UnbondAddresses, Unbonds,
 };
@@ -1106,6 +1107,30 @@ pub async fn get_validator_addresses_at_epoch(
     Ok(validators)
 }
 
+pub async fn get_masp_rates(
+    client: &HttpClient,
+) -> anyhow::Result<Vec<MaspRewardData>> {
+    let operation = || async {
+        let masp_rates = rpc::query_masp_reward_tokens(client)
+            .await
+            .context("Failed to query masp reward tokens")?;
+
+        let masp_rates = masp_rates.into_iter().map(|data| MaspRewardData {
+            address: Id::from(data.address),
+            max_reward_rate: data.max_reward_rate.to_string(),
+            kp_gain: data.kp_gain.to_string(),
+            kd_gain: data.kd_gain.to_string(),
+            locked_amount_target: Amount::from(NamadaSdkAmount::from(
+                data.locked_amount_target,
+            )),
+        });
+
+        Ok(masp_rates.collect())
+    };
+
+    default_retry(operation).await
+}
+
 fn to_epoch(epoch: u32) -> NamadaSdkEpoch {
     NamadaSdkEpoch::from(epoch as u64)
 }

governance/src/config.rs

@@ -1,20 +1,5 @@
-use core::fmt;
-use std::fmt::Display;
-
 use shared::log_config::LogConfig;
 
-#[derive(clap::ValueEnum, Clone, Debug, Copy)]
-pub enum CargoEnv {
-    Development,
-    Production,
-}
-
-impl Display for CargoEnv {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{:?}", self)
-    }
-}
-
 #[derive(clap::Parser)]
 pub struct AppConfig {
     #[clap(long, env)]

orm/migrations/2025-08-13-081325_masp_rates/down.sql

@@ -0,0 +1,2 @@
+-- This file should undo anything in `up.sql`
+DROP TABLE IF EXISTS masp_rates;

orm/migrations/2025-08-13-081325_masp_rates/up.sql

@@ -0,0 +1,8 @@
+-- Your SQL goes here
+CREATE TABLE masp_rates (
+    token VARCHAR PRIMARY KEY NOT NULL,
+    max_reward_rate VARCHAR NOT NULL,
+    kp_gain VARCHAR NOT NULL,
+    kd_gain VARCHAR NOT NULL,
+    locked_amount_target NUMERIC(78, 0) NOT NULL
+);

orm/src/blocks.rs

@@ -7,7 +7,7 @@ use crate::schema::blocks;
 #[derive(Insertable, Clone, Queryable, Selectable, Debug)]
 #[diesel(table_name = blocks)]
 #[diesel(check_for_backend(diesel::pg::Pg))]
-pub struct BlockInsertDb {
+pub struct BlockDb {
     pub height: i32,
     pub hash: Option<String>,
     pub app_hash: Option<String>,
@@ -16,7 +16,7 @@ pub struct BlockInsertDb {
     pub epoch: Option<i32>,
 }
 
-pub type BlockDb = BlockInsertDb;
+pub type BlockInsertDb = BlockDb;
 
 impl From<(Block, TendermintBlockResponse)> for BlockInsertDb {
     fn from(

orm/src/governance_proposal.rs

@@ -165,3 +165,30 @@ impl From<GovernanceProposalStatus> for GovernanceProposalUpdateStatusDb {
         }
     }
 }
+
+#[derive(Serialize, Queryable, Selectable, Insertable, Clone)]
+#[diesel(table_name = governance_proposals)]
+#[diesel(check_for_backend(diesel::pg::Pg))]
+pub struct GovernanceProposalNoDataDb {
+    pub id: i32,
+    pub content: String,
+    pub kind: GovernanceProposalKindDb,
+    pub tally_type: GovernanceProposalTallyTypeDb,
+    pub author: String,
+    pub start_epoch: i32,
+    pub end_epoch: i32,
+    pub activation_epoch: i32,
+    pub yay_votes: String,
+    pub nay_votes: String,
+    pub abstain_votes: String,
+    pub result: GovernanceProposalResultDb,
+}
+
+#[derive(Serialize, Queryable, Selectable, Insertable, Clone)]
+#[diesel(table_name = governance_proposals)]
+#[diesel(check_for_backend(diesel::pg::Pg))]
+pub struct GovernanceProposalData {
+    pub id: i32,
+    pub kind: GovernanceProposalKindDb,
+    pub data: Option<String>,
+}