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

feat(raiko): upgrade both rust toolchain and sp1/risc0 sdk. #444

Closed
wants to merge 12 commits into from
Closed
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
sp1 guest builds successfully
ctian1 committed Jan 9, 2025
commit f09cee80568798cb00dbaa1414d508db1c38e231
278 changes: 143 additions & 135 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -129,7 +129,7 @@ cap = { git = "https://github.com/brechtpd/cap", branch = "more-stats", features
# async, server, http queries
axum = { version = "0.7.4", features = ["macros"] }
tower-http = { version = "0.5.2", features = ["full"] }
tower = { version = "0.4.13", features = ["full"] }
tower = { version = "0.5.2", features = ["full"] }
utoipa-swagger-ui = { version = "7.1.0", features = ["axum"] }
utoipa-scalar = { version = "0.1.0", features = ["axum"] }
utoipa = { version = "4.2.0", features = ["axum_extras"] }
105 changes: 14 additions & 91 deletions provers/sp1/guest/Cargo.lock

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

15 changes: 9 additions & 6 deletions provers/sp1/guest/Cargo.toml
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ sha2 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sh
secp256k1 = { git = "https://github.com/sp1-patches/rust-secp256k1", tag = "patch-0.29.1-sp1-4.0.0-rc.3" }
harness-core = { path = "../../../harness/core" }
harness = { path = "../../../harness/macro", features = ["sp1"] }
substrate-bn = { git = "https://github.com/sp1-patches/bn", tag = "patch-0.6.0-sp1-4.0.0-rc.3" }
substrate-bn = { git = "https://github.com/sp1-patches/bn", tag = "patch-0.6.0-sp1-4.0.0-rc.3-v1" }
revm-precompile = { git = "https://github.com/taikoxyz/revm.git", branch = "v36-taiko", default-features = false, features = [
"taiko",
"std",
@@ -67,13 +67,16 @@ sha2 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sh
sha3 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha3", tag = "patch-sha3-0.10.8-sp1-4.0.0-rc.3" }
crypto-bigint = { git = "https://github.com/sp1-patches/RustCrypto-bigint", tag = "patch-0.5.5-sp1-4.0.0-rc.3" }
tiny-keccak = { git = "https://github.com/sp1-patches/tiny-keccak", tag = "patch-2.0.2-sp1-4.0.0-rc.3" }
curve25519-dalek = { git = "https://github.com/sp1-patches/curve25519-dalek", tag = "patch-4.1.3-sp1-4.0.0-rc.3" }
curve25519-dalek-ng = { git = "https://github.com/sp1-patches/curve25519-dalek-ng", tag = "patch-4.1.1-sp1-4.0.0-rc.3" }
ecdsa-core = { git = "https://github.com/sp1-patches/signatures", package = "ecdsa", tag = "patch-0.16.9-sp1-4.0.0-rc.3-v2" }
# curve25519-dalek = { git = "https://github.com/sp1-patches/curve25519-dalek", tag = "patch-4.1.3-sp1-4.0.0-rc.3" }
# curve25519-dalek-ng = { git = "https://github.com/sp1-patches/curve25519-dalek-ng", tag = "patch-4.1.1-sp1-4.0.0-rc.3" }
ecdsa-core = { git = "ssh://git@github.com/sp1-patches/signatures.git", package = "ecdsa", tag = "patch-0.16.9-sp1-4.0.0-rc.3-v2" }
secp256k1 = { git = "https://github.com/sp1-patches/rust-secp256k1", tag = "patch-0.29.1-sp1-4.0.0-rc.3" }
substrate-bn = { git = "https://github.com/sp1-patches/bn", tag = "patch-0.6.0-sp1-4.0.0-rc.3-v1" }
bls12_381 = { git = "https://github.com/sp1-patches/bls12_381", tag = "patch-0.8.0-sp1-4.0.0-rc.3-v1" }
rsa = { git = "https://github.com/sp1-patches/RustCrypto-RSA/", tag = "patch-0.9.6-sp1-4.0.0-rc.3" }
# bls12_381 = { git = "https://github.com/sp1-patches/bls12_381", tag = "patch-0.8.0-sp1-4.0.0-rc.3-v1" }
# rsa = { git = "https://github.com/sp1-patches/RustCrypto-RSA/", tag = "patch-0.9.6-sp1-4.0.0-rc.3" }

[patch."https://github.com/sp1-patches/signatures"]
ecdsa-core = { git = "ssh://[email protected]/sp1-patches/signatures.git", package = "ecdsa", tag = "patch-0.16.9-sp1-4.0.0-rc.3-v2" }

[features]
default = ["sp1-cycle-tracker"]
Binary file modified provers/sp1/guest/elf/sp1-aggregation
Binary file not shown.
Binary file modified provers/sp1/guest/elf/sp1-guest
Binary file not shown.
5 changes: 4 additions & 1 deletion script/build.sh
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
set -e

TOOLCHAIN_RISC0=+nightly-2024-04-18
TOOLCHAIN_SP1=+nightly-2024-04-18
TOOLCHAIN_SP1=+1.81.0
TOOLCHAIN_SGX=+nightly-2024-04-18

check_toolchain() {
@@ -53,6 +53,9 @@ if [ -z "$1" ] || [ "$1" == "native" ]; then
elif [ -z "${RUN}" ]; then
if [ -z "${TEST}" ]; then
echo "Building native prover"
echo ${FLAGS}
echo ${TASKDB}
echo $PWD
cargo build ${FLAGS} -F $TASKDB
else
echo "Building native tests"
2 changes: 1 addition & 1 deletion script/integration.sh
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
set -e

TOOLCHAIN_RISC0=+nightly-2024-04-18
TOOLCHAIN_SP1=+nightly-2024-04-18
TOOLCHAIN_SP1=+1.81.0
TOOLCHAIN_SGX=+nightly-2024-04-18
export PROOF_TYPE="$1"