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

Jump to bottom

v1.18: blockstore: scaffolding for chained merkle root conflict detection (backport of #719) #729

Merged
merged 2 commits into from
Apr 23, 2024
Merged

v1.18: blockstore: scaffolding for chained merkle root conflict detection (backport of #719) #729

merged 2 commits into from
Apr 23, 2024

Commits on Apr 23, 2024

  1. blockstore: scaffolding for chained merkle root conflict detection (#719 

    )

* blockstore: scaffolding for chained merkle root conflict detection

* pr feedback: use dummy feature key until final plumbing

(cherry picked from commit 411fdc9)

# Conflicts:
#	sdk/src/feature_set.rs
    @AshwinSekar
    AshwinSekar committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    0087034 View commit details
    Browse the repository at this point in the history

  2. fix feature_set conflicts

    @AshwinSekar
    AshwinSekar committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    e6a3555 View commit details
    Browse the repository at this point in the history