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

ZIP-221: Validate chain history commitments in the non-finalized state #2301

Merged
merged 38 commits into from
Jul 7, 2021
Merged

ZIP-221: Validate chain history commitments in the non-finalized state #2301

merged 38 commits into from
Jul 7, 2021

Commits on Jun 14, 2021

  1. sketch of implementation

    @conradoplg
    conradoplg committed Jun 14, 2021
    Configuration menu
    Copy the full SHA
    5c7d941 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2021

  1. refined implementation; still incomplete

    @conradoplg
    conradoplg committed Jun 16, 2021
    Configuration menu
    Copy the full SHA
    5226145 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2021

  1. update librustzcash, change zcash_history to work with it

    @conradoplg
    conradoplg committed Jun 17, 2021
    Configuration menu
    Copy the full SHA
    3abbfa5 View commit details
    Browse the repository at this point in the history

  2. simplified code per review; renamed MMR to HistoryTree

    @conradoplg
    conradoplg committed Jun 17, 2021
    Configuration menu
    Copy the full SHA
    e929f3f View commit details
    Browse the repository at this point in the history

  3. expand HistoryTree implementation

    @conradoplg
    conradoplg committed Jun 17, 2021
    Configuration menu
    Copy the full SHA
    c1dd319 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/main' into zip221-non-finalized-… 

    …state
    @conradoplg
    conradoplg committed Jun 17, 2021
    Configuration menu
    Copy the full SHA
    e290fbd View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2021

  1. Merge remote-tracking branch 'origin/main' into zip221-non-finalized-… 

    …state
    @conradoplg
    conradoplg committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    edc3fe0 View commit details
    Browse the repository at this point in the history

  2. handle and propagate errors

    @conradoplg
    conradoplg committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    59b46fe View commit details
    Browse the repository at this point in the history

  3. simplify check.rs tracing

    @conradoplg
    conradoplg committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    d06dfcc View commit details
    Browse the repository at this point in the history

  4. add suggested TODO

    @conradoplg
    conradoplg committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    1cf9013 View commit details
    Browse the repository at this point in the history

  5. add HistoryTree::prune

    @conradoplg
    conradoplg committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    89c12c6 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2021

  1. fix bug in pruning

    @conradoplg
    conradoplg committed Jun 22, 2021
    Configuration menu
    Copy the full SHA
    b3d773a View commit details
    Browse the repository at this point in the history

  2. fix compilation of tests; still need to make them pass

    @conradoplg
    conradoplg committed Jun 22, 2021
    Configuration menu
    Copy the full SHA
    e2ab46c View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2021

  1. Apply suggestions from code review 

    Co-authored-by: teor <teor@riseup.net>
    @conradoplg @teor2345
    conradoplg and teor2345 authored Jun 23, 2021
    Configuration menu
    Copy the full SHA
    c52a66d View commit details
    Browse the repository at this point in the history

  2. Apply suggestions from code review 

    Co-authored-by: teor <teor@riseup.net>
    @conradoplg @teor2345
    conradoplg and teor2345 authored Jun 23, 2021
    Configuration menu
    Copy the full SHA
    e977cd0 View commit details
    Browse the repository at this point in the history

  3. improvements from code review

    @conradoplg
    conradoplg committed Jun 23, 2021
    Configuration menu
    Copy the full SHA
    030240f View commit details
    Browse the repository at this point in the history

  4. improve check.rs comments and variable names

    @conradoplg
    conradoplg committed Jun 23, 2021
    Configuration menu
    Copy the full SHA
    e416ef6 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2021

  1. fix HistoryTree which should use BTreeMap and not HashMap; fix non_fi… 

    …nalized_state prop tests
    @conradoplg
    conradoplg committed Jun 24, 2021
    Configuration menu
    Copy the full SHA
    23e9bc2 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2021

  1. fix finalized_state proptest

    @conradoplg
    conradoplg committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    cf339a3 View commit details
    Browse the repository at this point in the history

  2. fix non_finalized_state tests by setting the correct commitments

    @conradoplg
    conradoplg committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    2271d73 View commit details
    Browse the repository at this point in the history

  3. renamed mmr.rs to history_tree.rs

    @conradoplg
    conradoplg committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    13e50e2 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/main' into zip221-non-finalized-… 

    …state
    @conradoplg
    conradoplg committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    e5a62e1 View commit details
    Browse the repository at this point in the history

  5. Add HistoryTree struct

    @conradoplg
    conradoplg committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    7837704 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2021

  1. expand non_finalized_state protest

    @conradoplg
    conradoplg committed Jun 28, 2021
    Configuration menu
    Copy the full SHA
    985c6aa View commit details
    Browse the repository at this point in the history

  2. Merge branch 'history-tree' into zip221-non-finalized-state

    @conradoplg
    conradoplg committed Jun 28, 2021
    Configuration menu
    Copy the full SHA
    d9a36ea View commit details
    Browse the repository at this point in the history

  3. fix typo

    @conradoplg
    conradoplg committed Jun 28, 2021
    Configuration menu
    Copy the full SHA
    5249335 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2021

  1. Merge remote-tracking branch 'origin/main' into zip221-non-finalized-… 

    …state
    @conradoplg
    conradoplg committed Jun 29, 2021
    Configuration menu
    Copy the full SHA
    787cc60 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2021

  1. Add HistoryTree struct

    @conradoplg
    conradoplg committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    fca06e6 View commit details
    Browse the repository at this point in the history

  2. Update zebra-chain/src/primitives/zcash_history.rs 

    Co-authored-by: Deirdre Connolly <deirdre@zfnd.org>
    @conradoplg @dconnolly
    conradoplg and dconnolly committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    fa847b8 View commit details
    Browse the repository at this point in the history

  3. fix formatting

    @conradoplg
    conradoplg committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    8e38ed4 View commit details
    Browse the repository at this point in the history

  4. Apply suggestions from code review 

    Co-authored-by: Deirdre Connolly <deirdre@zfnd.org>
    @conradoplg @dconnolly
    conradoplg and dconnolly committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    f154696 View commit details
    Browse the repository at this point in the history

  5. history_tree.rs: fixes from code review

    @conradoplg
    conradoplg committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    81b0ddb View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/main' into zip221-non-finalized-… 

    …state
    @conradoplg
    conradoplg committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    63d4fb0 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'history-tree' into zip221-non-finalized-state

    @conradoplg
    conradoplg committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    590a0d7 View commit details
    Browse the repository at this point in the history

  8. fixes to work with updated HistoryTree

    @conradoplg
    conradoplg committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    608c2e2 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2021

  1. Improvements from code review

    @conradoplg
    conradoplg committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    8dae6e7 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2021

  1. Add Debug implementations to allow comparing Chains with proptest_ass… 

    …ert_eq
    @conradoplg
    conradoplg committed Jul 5, 2021
    Configuration menu
    Copy the full SHA
    2e928db View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2021

  1. Merge remote-tracking branch 'origin/main' into zip221-non-finalized-… 

    …state
    @conradoplg
    conradoplg committed Jul 6, 2021
    Configuration menu
    Copy the full SHA
    e9add63 View commit details
    Browse the repository at this point in the history