fix left-over y in blind_signatures table auth database

This commit is contained in:
lollerfirst
2025-08-22 13:10:43 +02:00
parent 6f25620f06
commit ea9b9324f6
4 changed files with 14 additions and 8 deletions

View File

@@ -2,6 +2,8 @@
/// Auto-generated by build.rs /// Auto-generated by build.rs
pub static MIGRATIONS: &[(&str, &str, &str)] = &[ pub static MIGRATIONS: &[(&str, &str, &str)] = &[
("postgres", "1_init.sql", include_str!(r#"./migrations/postgres/1_init.sql"#)), ("postgres", "1_init.sql", include_str!(r#"./migrations/postgres/1_init.sql"#)),
("postgres", "20250822104351_rename_blind_message_y_to_b.sql", include_str!(r#"./migrations/postgres/20250822104351_rename_blind_message_y_to_b.sql"#)),
("sqlite", "1_fix_sqlx_migration.sql", include_str!(r#"./migrations/sqlite/1_fix_sqlx_migration.sql"#)), ("sqlite", "1_fix_sqlx_migration.sql", include_str!(r#"./migrations/sqlite/1_fix_sqlx_migration.sql"#)),
("sqlite", "20250109143347_init.sql", include_str!(r#"./migrations/sqlite/20250109143347_init.sql"#)), ("sqlite", "20250109143347_init.sql", include_str!(r#"./migrations/sqlite/20250109143347_init.sql"#)),
("sqlite", "20250822104351_rename_blind_message_y_to_b.sql", include_str!(r#"./migrations/sqlite/20250822104351_rename_blind_message_y_to_b.sql"#)),
]; ];

View File

@@ -0,0 +1,2 @@
-- Rename column y to b
ALTER TABLE blind_signature RENAME COLUMN y TO blinded_message;

View File

@@ -0,0 +1,2 @@
-- Rename column y to b
ALTER TABLE blind_signature RENAME COLUMN y TO blinded_message;

View File

@@ -174,12 +174,12 @@ where
r#" r#"
INSERT INSERT
INTO blind_signature INTO blind_signature
(y, amount, keyset_id, c) (blinded_message, amount, keyset_id, c)
VALUES VALUES
(:y, :amount, :keyset_id, :c) (:blinded_message, :amount, :keyset_id, :c)
"#, "#,
)? )?
.bind("y", message.to_bytes().to_vec()) .bind("blinded_message", message.to_bytes().to_vec())
.bind("amount", u64::from(signature.amount) as i64) .bind("amount", u64::from(signature.amount) as i64)
.bind("keyset_id", signature.keyset_id.to_string()) .bind("keyset_id", signature.keyset_id.to_string())
.bind("c", signature.c.to_bytes().to_vec()) .bind("c", signature.c.to_bytes().to_vec())
@@ -353,17 +353,17 @@ where
c, c,
dleq_e, dleq_e,
dleq_s, dleq_s,
y blinded_message,
FROM FROM
blind_signature blind_signature
WHERE y IN (:y) WHERE blinded_message IN (:blinded_message)
"#, "#,
)? )?
.bind_vec( .bind_vec(
"y", "blinded_message",
blinded_messages blinded_messages
.iter() .iter()
.map(|y| y.to_bytes().to_vec()) .map(|bm| bm.to_bytes().to_vec())
.collect(), .collect(),
) )
.fetch_all(&*conn) .fetch_all(&*conn)
@@ -382,7 +382,7 @@ where
.collect::<Result<HashMap<_, _>, Error>>()?; .collect::<Result<HashMap<_, _>, Error>>()?;
Ok(blinded_messages Ok(blinded_messages
.iter() .iter()
.map(|y| blinded_signatures.remove(y)) .map(|bm| blinded_signatures.remove(bm))
.collect()) .collect())
} }