risc0 / risc0-foundry-template

Template for integrating RISC Zero and Ethereum using Foundry
https://risczero.com
99 stars 55 forks source link

Reconcile hackathon updates #14

Closed tzerrell closed 1 year ago

tzerrell commented 1 year ago

Since @carterbrett is not currently available to fix the merge conflicts in #10, I've created this PR to include that work, plus fix the merge conflicts. In places there was no reasonable way to merge without rewriting, so this adds some of my own writing as well. This also includes some minor fixes around links and names.