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

Integrated merkleTree library and modified simple adder #17

Merged
merged 5 commits into from
Mar 28, 2018
Merged

Integrated merkleTree library and modified simple adder #17

merged 5 commits into from
Mar 28, 2018

Conversation

hswick
Copy link
Contributor

@hswick hswick commented Mar 27, 2018

This PR implements proper merkle proofing both onchain and offchain

@hswick
Copy link
Contributor Author

hswick commented Mar 27, 2018 •
edited
Loading

Took code from here and modified it a bit to work with this code.

I don't think this will be its final form as I think we shouldn't be responsible for maintaining this code. IMO, best thing to do is to add the ordered merkle tree features here
And then import it as a library

@hswick hswick merged commit ec9746b into master Mar 28, 2018
@juztamau5 juztamau5 mentioned this pull request Apr 5, 2018
Merged
hswick added a commit that referenced this pull request Apr 6, 2018
@hswick
Merge pull request #19 from juztamau5/pr-17-fixes
ed02a06 
Fix SimpleAdderVM test cases after #17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@hswick