Skip to content
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

feat: add total reward for epoch #204

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

feat: add total reward for epoch #204

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a3040ff
feat: add total reward for epoch
neocybereth Dec 13, 2024
523a368
fix: add migration to add epoch field to rewwrds table
neocybereth Dec 13, 2024
5030f97
fix: restore sample_env
neocybereth Dec 13, 2024
3540112
fix: add rewards migrations
neocybereth Dec 16, 2024
90fecd6
fix: add pos_rewards table
neocybereth Dec 16, 2024
2146524
fix: update migrations
neocybereth Dec 17, 2024
59726d0
fix: update migration
neocybereth Dec 17, 2024
149ed55
fix: update accoridng to review
neocybereth Dec 17, 2024
92e0aa7
fix: formatting on schema
neocybereth Dec 30, 2024
c61a2e6
fix: update rewards epoch func
neocybereth Dec 30, 2024
0957a4a
fix: orm pos_rewards fix for bigdecimal
neocybereth Dec 30, 2024
1244bab
fix: update sql statements
neocybereth Dec 30, 2024
fae5e1f
fix: add webserver endpoint
neocybereth Dec 30, 2024
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
1 change: 1 addition & 0 deletions orm/migrations/2024-12-16-231256_add_epoch_pos_rewards_table/down.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE pos_rewards DROP COLUMN epoch;
3 changes: 3 additions & 0 deletions orm/migrations/2024-12-16-231256_add_epoch_pos_rewards_table/up.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-- Alters the pos_rewards table to add a fourth column:
-- epoch: INTEGER, representing the epoch number
ALTER TABLE pos_rewards ADD COLUMN epoch INTEGER NOT NULL;
neocybereth marked this conversation as resolved.
Show resolved Hide resolved
18 changes: 8 additions & 10 deletions orm/src/pos_rewards.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,27 @@
use std::str::FromStr;

use bigdecimal::BigDecimal;
use diesel::{Insertable, Queryable, Selectable};
use shared::rewards::Reward;

use crate::schema::pos_rewards;
use shared::rewards::Reward;

#[derive(Insertable, Clone, Queryable, Selectable)]
#[derive(Insertable, Queryable, Selectable, Clone)]
#[diesel(table_name = pos_rewards)]
#[diesel(check_for_backend(diesel::pg::Pg))]
pub struct PosRewardInsertDb {
pub owner: String,
pub validator_id: i32,
pub raw_amount: BigDecimal,
pub epoch: i32,
}

pub type PoSRewardDb = PosRewardInsertDb;

impl PosRewardInsertDb {
pub fn from_reward(reward: Reward, validator_id: i32) -> Self {
Self {
pub fn from_reward(reward: Reward, validator_id: i32, epoch: i32) -> Self {
// Assuming reward.amount.as_i64() is available
PosRewardInsertDb {
owner: reward.delegation_pair.delegator_address.to_string(),
raw_amount: BigDecimal::from_str(&reward.amount.to_string())
.expect("Invalid amount"),
validator_id,
raw_amount: BigDecimal::from(reward.amount.as_i64()),
epoch,
}
}
}
67 changes: 12 additions & 55 deletions orm/src/schema.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,91 +1,47 @@
// @generated automatically by Diesel CLI.

pub mod sql_types {
#[derive(
diesel::query_builder::QueryId,
std::fmt::Debug,
diesel::sql_types::SqlType,
)]
#[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)]
#[diesel(postgres_type(name = "crawler_name"))]
pub struct CrawlerName;

#[derive(
diesel::query_builder::QueryId,
std::fmt::Debug,
diesel::sql_types::SqlType,
)]
#[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)]
#[diesel(postgres_type(name = "governance_kind"))]
pub struct GovernanceKind;

#[derive(
diesel::query_builder::QueryId,
std::fmt::Debug,
diesel::sql_types::SqlType,
)]
#[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)]
#[diesel(postgres_type(name = "governance_result"))]
pub struct GovernanceResult;

#[derive(
diesel::query_builder::QueryId,
std::fmt::Debug,
diesel::sql_types::SqlType,
)]
#[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)]
#[diesel(postgres_type(name = "governance_tally_type"))]
pub struct GovernanceTallyType;

#[derive(
diesel::query_builder::QueryId,
std::fmt::Debug,
diesel::sql_types::SqlType,
)]
#[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)]
#[diesel(postgres_type(name = "payment_kind"))]
pub struct PaymentKind;

#[derive(
diesel::query_builder::QueryId,
std::fmt::Debug,
diesel::sql_types::SqlType,
)]
#[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)]
#[diesel(postgres_type(name = "payment_recurrence"))]
pub struct PaymentRecurrence;

#[derive(
diesel::query_builder::QueryId,
std::fmt::Debug,
diesel::sql_types::SqlType,
)]
#[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)]
#[diesel(postgres_type(name = "token_type"))]
pub struct TokenType;

#[derive(
diesel::query_builder::QueryId,
std::fmt::Debug,
diesel::sql_types::SqlType,
)]
#[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)]
#[diesel(postgres_type(name = "transaction_kind"))]
pub struct TransactionKind;

#[derive(
diesel::query_builder::QueryId,
std::fmt::Debug,
diesel::sql_types::SqlType,
)]
#[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)]
#[diesel(postgres_type(name = "transaction_result"))]
pub struct TransactionResult;

#[derive(
diesel::query_builder::QueryId,
std::fmt::Debug,
diesel::sql_types::SqlType,
)]
#[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)]
#[diesel(postgres_type(name = "validator_state"))]
pub struct ValidatorState;

#[derive(
diesel::query_builder::QueryId,
std::fmt::Debug,
diesel::sql_types::SqlType,
)]
#[derive(diesel::query_builder::QueryId, std::fmt::Debug, diesel::sql_types::SqlType)]
#[diesel(postgres_type(name = "vote_kind"))]
pub struct VoteKind;
}
Expand Down Expand Up @@ -227,6 +183,7 @@ diesel::table! {
owner -> Varchar,
validator_id -> Int4,
raw_amount -> Numeric,
epoch -> Int4,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @neocybereth -- I have another suggestion here, it looks like you've reformatted a bunch of things in this file that aren't really part of this branch. It would be best to keep your changes minimal and not include these formatting changes.

I think this line is the only change that you should actually have in this file.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just pushed a commit that restores that formatting here, and also has one other small refactor in the rewards/src/services/namada.rs to reuse the existing function for querying current epoch instead of copying it: 2d0a5ac

Feel free to incorporate it into your branch here

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alright I've integrated both of those 👍

}
}

Expand Down
8 changes: 6 additions & 2 deletions rewards/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ async fn crawling_fn(

tracing::info!("Starting to update proposals...");

let current_epoch = namada_service::get_current_epoch(&client)
.await
.into_rpc_error()?;
// TODO: change this by querying all the pairs in the database
let delegations_pairs = namada_service::query_delegation_pairs(&client)
.await
Expand All @@ -100,18 +103,19 @@ async fn crawling_fn(

conn.interact(move |conn| {
conn.build_transaction().read_write().run(
|transaction_conn: &mut diesel::prelude::PgConnection| {
|transaction_conn: &mut diesel::pg::PgConnection| {
repository::pos_rewards::upsert_rewards(
transaction_conn,
non_zero_rewards,
current_epoch as i32,
)?;

repository::crawler_state::upsert_crawler_state(
transaction_conn,
(CrawlerName::Rewards, crawler_state).into(),
)?;

anyhow::Ok(())
Ok(())
},
)
})
Expand Down
13 changes: 6 additions & 7 deletions rewards/src/repository/pos_rewards.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,29 @@ use shared::rewards::Reward;
pub fn upsert_rewards(
transaction_conn: &mut PgConnection,
rewards: Vec<Reward>,
epoch: i32, // Add an epoch parameter
) -> anyhow::Result<()> {
diesel::insert_into(pos_rewards::table)
.values::<Vec<PosRewardInsertDb>>(
rewards
.into_iter()
.map(|reward| {
let validator_id: i32 = validators::table
.filter(
validators::namada_address.eq(&reward
.delegation_pair
.validator_address
.to_string()),
)
.filter(validators::namada_address.eq(
&reward.delegation_pair.validator_address.to_string(),
))
.select(validators::id)
.first(transaction_conn)
.expect("Failed to get validator");

PosRewardInsertDb::from_reward(reward, validator_id)
PosRewardInsertDb::from_reward(reward, validator_id, epoch)
})
.collect::<Vec<_>>(),
)
.on_conflict((
pos_rewards::columns::owner,
pos_rewards::columns::validator_id,
pos_rewards::columns::epoch, // Add epoch to conflict target
))
.do_update()
.set(
Expand Down
Loading
Loading