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

feat(raiko): update ontake config & docker build for next release #394

Merged
merged 2 commits into from
Oct 23, 2024
Merged

feat(raiko): update ontake config & docker build for next release #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17529df
update ontake config & docker build
smtmfft Oct 23, 2024
ec9bc39
fix ontake fork test
smtmfft Oct 23, 2024
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
84 changes: 42 additions & 42 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion Dockerfile.zk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,19 @@ ENV TARGET=sp1
RUN make guest
RUN cargo build --release ${BUILD_FLAGS} --features "sp1,risc0" --features "docker_build"

#FROM rust:1.79.0 as raiko-zk
FROM ubuntu:22.04 AS raiko-zk
RUN mkdir -p \
./bin \
/etc/raiko \
/var/log/raiko \
/tmp/risc0-cache

RUN apt-get update && apt-get install -y \
ca-certificates \
openssl \
curl \
&& rm -rf /var/lib/apt/lists/*

# copy to /etc/raiko, but if self register mode, the mounted one will overwrite it.
COPY --from=builder /opt/raiko/host/config/config.sgx.json /etc/raiko/
COPY --from=builder /opt/raiko/host/config/chain_spec_list_default.json /etc/raiko/chain_spec_list.docker.json
Expand Down
25 changes: 15 additions & 10 deletions host/config/chain_spec_list_default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,14 @@
"beacon_rpc": null,
"verifier_address_forks": {
"HEKLA": {
"SGX":"0x532efbf6d62720d0b2a2bb9d11066e8588cae6d9",
"SP1":"0xFbE49f777E0078b3Fa0bae6de4794c88d6EA6DDD",
"RISC0":"0x4fEd801C5a876D4289e869cbEfA1E1A448b10714"
"SGX": "0x532efbf6d62720d0b2a2bb9d11066e8588cae6d9",
"SP1": "0xFbE49f777E0078b3Fa0bae6de4794c88d6EA6DDD",
"RISC0": "0x4fEd801C5a876D4289e869cbEfA1E1A448b10714"
},
"ONTAKE": {
"SGX": "0x532efbf6d62720d0b2a2bb9d11066e8588cae6d9",
"SP1": "0xFbE49f777E0078b3Fa0bae6de4794c88d6EA6DDD",
"RISC0":"0x4fEd801C5a876D4289e869cbEfA1E1A448b10714"
"RISC0": "0x4fEd801C5a876D4289e869cbEfA1E1A448b10714"
}
},
"genesis_time": 0,
Expand All @@ -122,7 +122,7 @@
"Block": 0
},
"ONTAKE": {
"Block": 999999
"Block": 538304
},
"CANCUN": "TBD"
},
Expand All @@ -138,13 +138,18 @@
"beacon_rpc": null,
"verifier_address_forks": {
"HEKLA": {
"SGX":"0xb0f3186FC1963f774f52ff455DC86aEdD0b31F81",
"SP1":"0x0000000000000000000000000000000000000000",
"RISC0":"0x0000000000000000000000000000000000000000"
}
"SGX": "0xb0f3186FC1963f774f52ff455DC86aEdD0b31F81",
"SP1": "0x0000000000000000000000000000000000000000",
"RISC0": "0x0000000000000000000000000000000000000000"
},
"ONTAKE": {
"SGX": "0xb0f3186FC1963f774f52ff455DC86aEdD0b31F81",
"SP1": "0x0000000000000000000000000000000000000000",
"RISC0": "0x0000000000000000000000000000000000000000"
}
},
"genesis_time": 0,
"seconds_per_slot": 1,
"is_taiko": true
}
]
]
2 changes: 1 addition & 1 deletion host/config/chain_spec_list_devnet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"RISC0": null
}
},
"genesis_time": 1726040200,
"genesis_time": 1728872400,
"seconds_per_slot": 12,
"is_taiko": false
},
Expand Down
4 changes: 2 additions & 2 deletions lib/src/consts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,11 +316,11 @@ mod tests {
.unwrap();
assert_eq!(taiko_mainnet_spec.active_fork(0, 0).unwrap(), SpecId::HEKLA);
assert_eq!(
taiko_mainnet_spec.active_fork(999998, 0).unwrap(),
taiko_mainnet_spec.active_fork(538303, 0).unwrap(),
SpecId::HEKLA
);
assert_eq!(
taiko_mainnet_spec.active_fork(999999, 0).unwrap(),
taiko_mainnet_spec.active_fork(538304, 0).unwrap(),
SpecId::ONTAKE
);
}
Expand Down
2 changes: 1 addition & 1 deletion provers/risc0/driver/src/methods/risc0_aggregation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pub const RISC0_AGGREGATION_ELF: &[u8] =
include_bytes!("../../../guest/target/riscv32im-risc0-zkvm-elf/release/risc0-aggregation");
pub const RISC0_AGGREGATION_ID: [u32; 8] = [
3190692238, 1991537256, 2457220677, 1764592515, 1585399420, 97928005, 276688816, 447831862,
3597901240, 347325416, 3317656102, 3291080048, 86415258, 1347371281, 3482575988, 4094302300,
];
2 changes: 1 addition & 1 deletion provers/risc0/driver/src/methods/risc0_guest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pub const RISC0_GUEST_ELF: &[u8] =
include_bytes!("../../../guest/target/riscv32im-risc0-zkvm-elf/release/risc0-guest");
pub const RISC0_GUEST_ID: [u32; 8] = [
3473581204, 2561439051, 2320161003, 3018340632, 1481329104, 1608433297, 3314099706, 2669934765,
1969729193, 1889995288, 261404698, 2630336538, 339020519, 1410619780, 514721746, 1213424171,
];
52 changes: 26 additions & 26 deletions provers/risc0/guest/Cargo.lock
View file
Open in desktop

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

5 changes: 3 additions & 2 deletions provers/sp1/driver/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ harness = true
[[bin]]
name = "sp1-verifier"
path = "src/verifier.rs"
required-features = ["enable"]
required-features = ["enable-verifier"]


[dependencies]
Expand Down Expand Up @@ -63,4 +63,5 @@ enable = [
"tracing",
]
neon = ["sp1-sdk?/neon"]
foundry-verify = []
foundry-verify = []
enable-verifier = []
Loading
Loading