Skip to content

fix: avoid double hashing JMT keys #170

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

Merged
merged 1 commit into from
Dec 12, 2024
Merged

fix: avoid double hashing JMT keys #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 4 additions & 8 deletions crates/common/src/test_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ impl TestTreeState {
)
.unwrap();

let hashed_id = Digest::hash(&service_id);
let key_hash = KeyHash::with::<Hasher>(hashed_id);
let key_hash = KeyHash::with::<Hasher>(&service_id);

Service {
id: service_id.clone(),
Expand Down Expand Up @@ -95,8 +94,7 @@ impl TestTreeState {
)
.unwrap();

let hashed_id = Digest::hash(&id);
let key_hash = KeyHash::with::<Hasher>(hashed_id);
let key_hash = KeyHash::with::<Hasher>(&id);

TestAccount {
id,
Expand Down Expand Up @@ -218,8 +216,7 @@ pub fn create_random_insert(state: &mut TestTreeState, rng: &mut StdRng) -> Inse
]);
let signature = service.sk.sign(&hash.to_bytes());

let hashed_id = Digest::hash(&random_string);
let key_hash = KeyHash::with::<Hasher>(hashed_id);
let key_hash = KeyHash::with::<Hasher>(&random_string);

let entry = Hashchain::empty()
.create_account(
Expand Down Expand Up @@ -247,8 +244,7 @@ pub fn create_random_update(state: &mut TestTreeState, rng: &mut StdRng) -> Upda

let key = state.inserted_keys.iter().nth(rng.gen_range(0..state.inserted_keys.len())).unwrap();

let hashed_id = Digest::hash(key);
let key_hash = KeyHash::with::<Hasher>(hashed_id);
let key_hash = KeyHash::with::<Hasher>(key);

let Found(mut hc, _) = state.tree.get(key_hash).unwrap() else {
panic!("No response found for key. Cannot perform update.");
Expand Down
9 changes: 3 additions & 6 deletions crates/common/src/transaction_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,7 @@ impl TransactionBuilder {
signing_key: &SigningKey,
key_idx: usize,
) -> UncommittedTransaction {
let hashed_id = Digest::hash(id);
let key_hash = KeyHash::with::<Hasher>(hashed_id);
let key_hash = KeyHash::with::<Hasher>(id);

let Ok(Found(hc, _)) = self.tree.get(key_hash) else {
panic!("No existing hashchain found for {}", id)
Expand Down Expand Up @@ -228,8 +227,7 @@ impl TransactionBuilder {
signing_key: &SigningKey,
key_idx: usize,
) -> UncommittedTransaction {
let hashed_id = Digest::hash(id);
let key_hash = KeyHash::with::<Hasher>(hashed_id);
let key_hash = KeyHash::with::<Hasher>(id);

let Ok(Found(hc, _)) = self.tree.get(key_hash) else {
panic!("No existing hashchain found for {}", id)
Expand Down Expand Up @@ -306,8 +304,7 @@ impl TransactionBuilder {
signing_key: &SigningKey,
key_idx: usize,
) -> UncommittedTransaction {
let hashed_id = Digest::hash(id);
let key_hash = KeyHash::with::<Hasher>(hashed_id);
let key_hash = KeyHash::with::<Hasher>(id);

let Ok(Found(hc, _)) = self.tree.get(key_hash) else {
panic!("No existing hashchain found for {}", id)
Expand Down
11 changes: 4 additions & 7 deletions crates/common/src/tree/snarkable_tree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ where
fn process_transaction(&mut self, transaction: Transaction) -> Result<Proof> {
match &transaction.entry.operation {
Operation::AddKey { .. } | Operation::RevokeKey { .. } | Operation::AddData { .. } => {
let hashed_id = Digest::hash(&transaction.id);
let key_hash = KeyHash::with::<Hasher>(hashed_id);
let key_hash = KeyHash::with::<Hasher>(&transaction.id);

debug!("updating hashchain for user id {}", transaction.id);
let proof = self.update(key_hash, transaction.entry)?;
Expand All @@ -52,8 +51,7 @@ where
"Id of transaction needs to be equal to operation id"
);

let hashed_id = Digest::hash(id);
let account_key_hash = KeyHash::with::<Hasher>(hashed_id);
let account_key_hash = KeyHash::with::<Hasher>(id);

// Verify that the account doesn't already exist
if matches!(self.get(account_key_hash)?, Found(_, _)) {
Expand All @@ -63,7 +61,7 @@ where
)));
}

let service_key_hash = KeyHash::with::<Hasher>(Digest::hash(service_id.as_bytes()));
let service_key_hash = KeyHash::with::<Hasher>(service_id);

let Found(service_hashchain, _) = self.get(service_key_hash)? else {
bail!("Failed to get hashchain for service ID {}", service_id);
Expand Down Expand Up @@ -100,8 +98,7 @@ where
"Id of transaction needs to be equal to operation id"
);

let hashed_id = Digest::hash(id);
let key_hash = KeyHash::with::<Hasher>(hashed_id);
let key_hash = KeyHash::with::<Hasher>(id);

debug!("creating new hashchain for service id {}", id);

Expand Down
3 changes: 1 addition & 2 deletions crates/node_types/prover/src/prover/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,8 +459,7 @@ impl Prover {

pub async fn get_hashchain(&self, id: &String) -> Result<HashchainResponse> {
let tree = self.tree.read().await;
let hashed_id = Digest::hash(id);
let key_hash = KeyHash::with::<Hasher>(hashed_id);
let key_hash = KeyHash::with::<Hasher>(id);

tree.get(key_hash)
}
Expand Down
Loading