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

Fix switch proposer_duties table primary key to slot_number #13

Merged
merged 2 commits into from
Oct 15, 2024
Merged

Fix switch proposer_duties table primary key to slot_number #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2e299c
fix: in proposer duties table primary key should not be the public key
thedevbirb Oct 4, 2024
fcc1e49
fix: in proposer duties table primary key should not be the public key
Akagi201 Oct 15, 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
2 changes: 1 addition & 1 deletion crates/cmd/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ helix-common.workspace = true

tokio.workspace = true
tracing.workspace = true
tracing-subscriber.workspace = true
tracing-subscriber = { workspace = true, features = ["env-filter"] }
tracing-appender.workspace = true

num_cpus.workspace = true
3 changes: 2 additions & 1 deletion crates/cmd/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ async fn run() {

match &config.logging {
LoggingConfig::Console => {
tracing_subscriber::fmt().init();
let filter_layer = tracing_subscriber::EnvFilter::from_default_env();
tracing_subscriber::fmt().with_env_filter(filter_layer).init();
}
LoggingConfig::File { dir_path, file_name } => {
let file_appender = tracing_appender::rolling::daily(dir_path, file_name);
Expand Down
2 changes: 2 additions & 0 deletions crates/database/src/postgres/migrations/V22__proposer_duties_fix.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE proposer_duties DROP CONSTRAINT proposer_duties_pkey;
ALTER TABLE proposer_duties ADD PRIMARY KEY (slot_number);
2 changes: 1 addition & 1 deletion crates/database/src/postgres/postgres_db_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ impl DatabaseService for PostgresDatabaseService {

// Join the values clauses and append them to the SQL statement
sql.push_str(&values_clauses.join(", "));
sql.push_str(" ON CONFLICT (public_key) DO NOTHING");
sql.push_str(" ON CONFLICT (slot_number) DO NOTHING");

// Execute the query
transaction.execute(&sql, &params[..]).await?;
Expand Down