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

* update ontake config & docker build * fix ontake fork test
taikoxyz · Oct 23, 2024 · 4bacdac · 4bacdac
1 parent 238705a
commit 4bacdac
Show file tree

Hide file tree

Showing 12 changed files with 139 additions and 118 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Dockerfile.zk b/Dockerfile.zk
@@ -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

diff --git a/host/config/chain_spec_list_default.json b/host/config/chain_spec_list_default.json
@@ -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,
@@ -122,7 +122,7 @@
                 "Block": 0
             },
             "ONTAKE": {
-                "Block": 999999
+                "Block": 538304
             },
             "CANCUN": "TBD"
         },
@@ -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
     }
-]
+]
diff --git a/host/config/chain_spec_list_devnet.json b/host/config/chain_spec_list_devnet.json
@@ -31,7 +31,7 @@
                 "RISC0": null
             }
         },
-        "genesis_time": 1726040200,
+        "genesis_time": 1728872400,
         "seconds_per_slot": 12,
         "is_taiko": false
     },

diff --git a/lib/src/consts.rs b/lib/src/consts.rs
@@ -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
         );
     }

diff --git a/provers/risc0/driver/src/methods/risc0_aggregation.rs b/provers/risc0/driver/src/methods/risc0_aggregation.rs
@@ -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,
 ];
diff --git a/provers/risc0/driver/src/methods/risc0_guest.rs b/provers/risc0/driver/src/methods/risc0_guest.rs
@@ -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,
 ];
diff --git a/provers/risc0/guest/Cargo.lock b/provers/risc0/guest/Cargo.lock
diff --git a/provers/sp1/driver/Cargo.toml b/provers/sp1/driver/Cargo.toml
@@ -12,7 +12,7 @@ harness = true
 [[bin]]
 name = "sp1-verifier"
 path = "src/verifier.rs"
-required-features = ["enable"]
+required-features = ["enable-verifier"]
 
 
 [dependencies]
@@ -63,4 +63,5 @@ enable = [
     "tracing",
 ]
 neon = ["sp1-sdk?/neon"]
-foundry-verify = []
+foundry-verify = []
+enable-verifier = []