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

4844 support + Move host to raiko-hosts #48

Merged
merged 21 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/multi-guests-r0' into 4844-merge…
…-wip

# Conflicts:
#	Cargo.lock
#	lib/Cargo.toml
#	lib/src/consts.rs
#	primitives/src/mpt.rs
#	pullblock.sh
#	raiko-guests/risc0/guest/Cargo.lock
#	raiko-guests/risc0/guest/Cargo.toml
#	raiko-guests/risc0/guest/src/main.rs
#	raiko-guests/succinct/Cargo.lock
#	raiko-guests/succinct/src/main.rs
#	raiko-host/Cargo.toml
#	raiko-host/src/host/host.rs
#	raiko-host/src/host/provider/mod.rs
#	raiko-host/src/host/provider/rpc_provider.rs
#	raiko-host/src/host/taiko_provider.rs
#	raiko-host/src/prover/execution.rs
#	raiko-host/src/prover/proof/risc0/mod.rs
#	raiko-host/src/prover/proof/succinct.rs
#	raiko-host/src/prover/request.rs
#	risc0-driver/Cargo.lock
  • Loading branch information
Brechtpd committed Mar 6, 2024
commit fd3058f905da57794587c083bfd6d623953f8b32
86 changes: 82 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion raiko-guests/risc0/guest/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions raiko-host/src/prover/proof/risc0/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ pub async fn execute_risc0(

let journal: String = result.clone().unwrap().1.journal.encode_hex();

let journal: String = result.clone().unwrap().1.journal.encode_hex();

// Create/verify Groth16 SNARK
if req.snark {
let Some((stark_uuid, stark_receipt)) = result else {
Expand Down
43 changes: 0 additions & 43 deletions risc0-driver/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.