Skip to content

Commit 4bacdac

Browse files
authored
feat(raiko): update ontake config & docker build for next release (#394)
* update ontake config & docker build * fix ontake fork test
1 parent 238705a commit 4bacdac

File tree

12 files changed

+139
-118
lines changed

12 files changed

+139
-118
lines changed

Cargo.lock

+42-42
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile.zk

+6-1
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,19 @@ ENV TARGET=sp1
6060
RUN make guest
6161
RUN cargo build --release ${BUILD_FLAGS} --features "sp1,risc0" --features "docker_build"
6262

63-
#FROM rust:1.79.0 as raiko-zk
6463
FROM ubuntu:22.04 AS raiko-zk
6564
RUN mkdir -p \
6665
./bin \
6766
/etc/raiko \
6867
/var/log/raiko \
6968
/tmp/risc0-cache
7069

70+
RUN apt-get update && apt-get install -y \
71+
ca-certificates \
72+
openssl \
73+
curl \
74+
&& rm -rf /var/lib/apt/lists/*
75+
7176
# copy to /etc/raiko, but if self register mode, the mounted one will overwrite it.
7277
COPY --from=builder /opt/raiko/host/config/config.sgx.json /etc/raiko/
7378
COPY --from=builder /opt/raiko/host/config/chain_spec_list_default.json /etc/raiko/chain_spec_list.docker.json

host/config/chain_spec_list_default.json

+15-10
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,14 @@
9999
"beacon_rpc": null,
100100
"verifier_address_forks": {
101101
"HEKLA": {
102-
"SGX":"0x532efbf6d62720d0b2a2bb9d11066e8588cae6d9",
103-
"SP1":"0xFbE49f777E0078b3Fa0bae6de4794c88d6EA6DDD",
104-
"RISC0":"0x4fEd801C5a876D4289e869cbEfA1E1A448b10714"
102+
"SGX": "0x532efbf6d62720d0b2a2bb9d11066e8588cae6d9",
103+
"SP1": "0xFbE49f777E0078b3Fa0bae6de4794c88d6EA6DDD",
104+
"RISC0": "0x4fEd801C5a876D4289e869cbEfA1E1A448b10714"
105105
},
106106
"ONTAKE": {
107107
"SGX": "0x532efbf6d62720d0b2a2bb9d11066e8588cae6d9",
108108
"SP1": "0xFbE49f777E0078b3Fa0bae6de4794c88d6EA6DDD",
109-
"RISC0":"0x4fEd801C5a876D4289e869cbEfA1E1A448b10714"
109+
"RISC0": "0x4fEd801C5a876D4289e869cbEfA1E1A448b10714"
110110
}
111111
},
112112
"genesis_time": 0,
@@ -122,7 +122,7 @@
122122
"Block": 0
123123
},
124124
"ONTAKE": {
125-
"Block": 999999
125+
"Block": 538304
126126
},
127127
"CANCUN": "TBD"
128128
},
@@ -138,13 +138,18 @@
138138
"beacon_rpc": null,
139139
"verifier_address_forks": {
140140
"HEKLA": {
141-
"SGX":"0xb0f3186FC1963f774f52ff455DC86aEdD0b31F81",
142-
"SP1":"0x0000000000000000000000000000000000000000",
143-
"RISC0":"0x0000000000000000000000000000000000000000"
144-
}
141+
"SGX": "0xb0f3186FC1963f774f52ff455DC86aEdD0b31F81",
142+
"SP1": "0x0000000000000000000000000000000000000000",
143+
"RISC0": "0x0000000000000000000000000000000000000000"
144+
},
145+
"ONTAKE": {
146+
"SGX": "0xb0f3186FC1963f774f52ff455DC86aEdD0b31F81",
147+
"SP1": "0x0000000000000000000000000000000000000000",
148+
"RISC0": "0x0000000000000000000000000000000000000000"
149+
}
145150
},
146151
"genesis_time": 0,
147152
"seconds_per_slot": 1,
148153
"is_taiko": true
149154
}
150-
]
155+
]

host/config/chain_spec_list_devnet.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"RISC0": null
3232
}
3333
},
34-
"genesis_time": 1726040200,
34+
"genesis_time": 1728872400,
3535
"seconds_per_slot": 12,
3636
"is_taiko": false
3737
},

lib/src/consts.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -316,11 +316,11 @@ mod tests {
316316
.unwrap();
317317
assert_eq!(taiko_mainnet_spec.active_fork(0, 0).unwrap(), SpecId::HEKLA);
318318
assert_eq!(
319-
taiko_mainnet_spec.active_fork(999998, 0).unwrap(),
319+
taiko_mainnet_spec.active_fork(538303, 0).unwrap(),
320320
SpecId::HEKLA
321321
);
322322
assert_eq!(
323-
taiko_mainnet_spec.active_fork(999999, 0).unwrap(),
323+
taiko_mainnet_spec.active_fork(538304, 0).unwrap(),
324324
SpecId::ONTAKE
325325
);
326326
}
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pub const RISC0_AGGREGATION_ELF: &[u8] =
22
include_bytes!("../../../guest/target/riscv32im-risc0-zkvm-elf/release/risc0-aggregation");
33
pub const RISC0_AGGREGATION_ID: [u32; 8] = [
4-
3190692238, 1991537256, 2457220677, 1764592515, 1585399420, 97928005, 276688816, 447831862,
4+
3597901240, 347325416, 3317656102, 3291080048, 86415258, 1347371281, 3482575988, 4094302300,
55
];
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pub const RISC0_GUEST_ELF: &[u8] =
22
include_bytes!("../../../guest/target/riscv32im-risc0-zkvm-elf/release/risc0-guest");
33
pub const RISC0_GUEST_ID: [u32; 8] = [
4-
3473581204, 2561439051, 2320161003, 3018340632, 1481329104, 1608433297, 3314099706, 2669934765,
4+
1969729193, 1889995288, 261404698, 2630336538, 339020519, 1410619780, 514721746, 1213424171,
55
];

provers/risc0/guest/Cargo.lock

+26-26
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

provers/sp1/driver/Cargo.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ harness = true
1212
[[bin]]
1313
name = "sp1-verifier"
1414
path = "src/verifier.rs"
15-
required-features = ["enable"]
15+
required-features = ["enable-verifier"]
1616

1717

1818
[dependencies]
@@ -63,4 +63,5 @@ enable = [
6363
"tracing",
6464
]
6565
neon = ["sp1-sdk?/neon"]
66-
foundry-verify = []
66+
foundry-verify = []
67+
enable-verifier = []

0 commit comments

Comments
 (0)