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.

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

Don't merkelize replay protection keys #1863

Merged
merged 8 commits into from
Sep 6, 2023

Conversation

grarco
Copy link
Contributor

@grarco grarco commented Sep 1, 2023

Describe your changes

Avoid adding the replay protection storage subkey to the merkle tree.
This does NOT address (not even partially) #1566.

Indicate on which release or other PRs this topic is based on

v0.21.1

Checklist before merging to draft

  • I have added a changelog
  • Git history is in acceptable state

grarco added a commit that referenced this pull request Sep 1, 2023
@yito88
Copy link
Member

yito88 commented Sep 1, 2023

Could you skip it also when restoring a merkle tree?

pub fn get_merkle_tree(

grarco added a commit that referenced this pull request Sep 1, 2023
@grarco grarco force-pushed the grarco/unmerkle-replay-protection branch from c7a9c5c to afe06c6 Compare September 1, 2023 15:58
@grarco
Copy link
Contributor Author

grarco commented Sep 1, 2023

Could you skip it also when restoring a merkle tree?

pub fn get_merkle_tree(

Done it, thanks for pointing it out! 👍🏻

@grarco grarco force-pushed the grarco/unmerkle-replay-protection branch from afe06c6 to fdfcfd9 Compare September 1, 2023 17:00
@grarco grarco marked this pull request as ready for review September 1, 2023 17:21
@Fraccaman
Copy link
Member

feel free to merge it to draft!

@grarco grarco mentioned this pull request Sep 4, 2023
grarco added a commit that referenced this pull request Sep 4, 2023
Fraccaman added a commit that referenced this pull request Sep 6, 2023
* origin/grarco/unmerkle-replay-protection:
  changelog: add #1863
  Adds unit test for replay keys merkle tree
  Handles remaining tree ops for replay
  Moves replay protection key check in storage
  Adjusts `has_key` implementation for replay protection keys
  Avoid replay protection keys when deleting from merkle tree
  Renames replay protection storage api
  Avoids merkelizing replay protection keys
Fraccaman added a commit that referenced this pull request Sep 6, 2023
* origin/grarco/unmerkle-replay-protection:
  changelog: add #1863
  Adds unit test for replay keys merkle tree
  Handles remaining tree ops for replay
  Moves replay protection key check in storage
  Adjusts `has_key` implementation for replay protection keys
  Avoid replay protection keys when deleting from merkle tree
  Renames replay protection storage api
  Avoids merkelizing replay protection keys
Fraccaman added a commit that referenced this pull request Sep 6, 2023
* origin/grarco/unmerkle-replay-protection:
  changelog: add #1863
  Adds unit test for replay keys merkle tree
  Handles remaining tree ops for replay
  Moves replay protection key check in storage
  Adjusts `has_key` implementation for replay protection keys
  Avoid replay protection keys when deleting from merkle tree
  Renames replay protection storage api
  Avoids merkelizing replay protection keys
Fraccaman added a commit that referenced this pull request Sep 6, 2023
* origin/grarco/unmerkle-replay-protection:
  changelog: add #1863
  Adds unit test for replay keys merkle tree
  Handles remaining tree ops for replay
  Moves replay protection key check in storage
  Adjusts `has_key` implementation for replay protection keys
  Avoid replay protection keys when deleting from merkle tree
  Renames replay protection storage api
  Avoids merkelizing replay protection keys
@Fraccaman Fraccaman merged commit 376a3e8 into main Sep 6, 2023
11 of 12 checks passed
@Fraccaman Fraccaman deleted the grarco/unmerkle-replay-protection branch September 6, 2023 21:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants