Merge branch 'main' into import-zisk

Author: Yue-Zhou1

.env

@@ -3,12 +3,12 @@ SP1_PRIVATE_KEY=your_private_key
 RUST_LOG=info
 
 # RISC0 Image IDs
-RISC0_AGGREGATION_ID=2c50d32c456a73c21ab6034ba58faf1c6ad45816b6a3694dfc0a7288de7ae6b4
-RISC0_BATCH_ID=dfa382f9a29ccf4dcd8416a7f72f4e0bc9045b6b5d90e8b3ff8d3f09c7ca5b8e
+RISC0_AGGREGATION_ID=e9aec1d30d25da1ccfc02a81c4b71f32e0a6f675dff4ce01fe4bd5f96ff320bd
+RISC0_BATCH_ID=ee950d20e2483b9b6b859272feaea2dd84cea8a9cfdf1af8834df6b75c3d715e
 
 # SP1 VK Hashes
-SP1_AGGREGATION_VK_HASH=3d38daeb77ae0c9e13ae32f30bf525210e69e4f80422b4b77161a86a44bcb89e
-SP1_BATCH_VK_HASH=3e7c15c61cf1fc8b32d4a0d20f5b676f39a0b8a338843a773ae3eec53759f3f0
+SP1_AGGREGATION_VK_HASH=205b010d6f951ff14a29257944eea12e5554d853002190e440dc4e925ec6d6c3
+SP1_BATCH_VK_HASH=58a28867325f4d123d7097024be2f4b56d71f5ab14a35aed4bc3550426f2bed3
 
 # SGX MRENCLAVE
 SGX_MRENCLAVE=665158457642d5ba20f35ea58615f086bd0913be2d590a5dc9f15c14d430aac7

.gitignore

@@ -64,4 +64,8 @@ perf.data.old
 
 log.build.*
 
-venv/
+# Python
+# -----------------------------------------------------------------------------------------
+venv/
+.venv/
+

Dockerfile

@@ -129,6 +129,8 @@ RUN echo "Updating .env file with extracted MRENCLAVE..." && \
         echo "SGXGETH_MRENCLAVE=$SGXGETH_MRENCLAVE" >> .env; \
     fi && \
     echo "Final .env file:" && \
-    cat .env
+    cat .env && \
+    cp .env bin/.env
 
+WORKDIR /opt/raiko/bin
 ENTRYPOINT [ "/opt/raiko/bin/entrypoint.sh" ]

Dockerfile.zk

@@ -94,6 +94,8 @@ COPY --from=builder /opt/raiko/host/config/config.taiko_mainnet.json /etc/raiko/
 COPY --from=builder /opt/raiko/host/config/chain_spec_list_default.json /etc/raiko/chain_spec_list_default.json
 COPY --from=builder /opt/raiko/host/config/chain_spec_list_devnet.json /etc/raiko/chain_spec_list_devnet.json
 COPY --from=builder /opt/raiko/target/release/raiko-host /opt/raiko/bin/
+# Copy the .env file with RISC0 and SP1 image IDs from builder stage
+COPY --from=builder /opt/raiko/.env /opt/raiko/.env
 
 WORKDIR /opt/raiko/bin
 COPY ./docker/entrypoint.sh /opt/raiko/bin/

RELEASE.md

@@ -1,3 +1,25 @@
+# zk:v1.10.4
+
+## image
+
+us-docker.pkg.dev/evmchain/images/raiko-zk:1.10.4
+
+## risc0
+
+risc0 elf image id: e9aec1d30d25da1ccfc02a81c4b71f32e0a6f675dff4ce01fe4bd5f96ff320bd
+"/opt/raiko/provers/risc0/guest/target/riscv32im-risc0-zkvm-elf/release/risc0-aggregation"
+risc0 elf image id: ee950d20e2483b9b6b859272feaea2dd84cea8a9cfdf1af8834df6b75c3d715e
+"/opt/raiko/provers/risc0/guest/target/riscv32im-risc0-zkvm-elf/release/risc0-batch"
+
+## sp1
+
+"/opt/raiko/provers/sp1/guest/target/riscv32im-succinct-zkvm-elf/release/sp1-aggregation"
+sp1 elf vk bn256 is: 0x0040b6021bbe547fc651492bcc4eea12eaaa9b0a60086439206e27495ec6d6c3
+sp1 elf vk hash_bytes is: 205b010d6f951ff14a29257944eea12e5554d853002190e440dc4e925ec6d6c3
+"/opt/raiko/provers/sp1/guest/target/riscv32im-succinct-zkvm-elf/release/sp1-batch"
+sp1 elf vk bn256 is: 0x00b14510cec97d3449eb84b814be2f4b5dae3eb56528d6bb65e1aa8226f2bed3
+sp1 elf vk hash_bytes is: 58a28867325f4d123d7097024be2f4b56d71f5ab14a35aed4bc3550426f2bed3
+
 # v1.10.2
 
 ## image

script/update_imageid.sh

@@ -382,44 +382,52 @@ update_env_file() {
         return 1
     fi
 
-    # Read current file content
-    local env_content=$(cat "$env_file")
-    
     # Update RISC0 image IDs if provided
     if [ -n "$RISC0_AGGREGATION_ID" ]; then
-        env_content=$(echo "$env_content" | sed "s/^RISC0_AGGREGATION_ID=.*/RISC0_AGGREGATION_ID=$RISC0_AGGREGATION_ID/")
+        if grep -q "^RISC0_AGGREGATION_ID=" "$env_file"; then
+            # Update existing entry
+            sed -i "s/^RISC0_AGGREGATION_ID=.*/RISC0_AGGREGATION_ID=$RISC0_AGGREGATION_ID/" "$env_file"
+        else
+            # Add new entry
+            echo "RISC0_AGGREGATION_ID=$RISC0_AGGREGATION_ID" >> "$env_file"
+        fi
         print_status "Updated RISC0_AGGREGATION_ID in $env_file: $RISC0_AGGREGATION_ID"
     fi
 
     if [ -n "$RISC0_BATCH_ID" ]; then
-        env_content=$(echo "$env_content" | sed "s/^RISC0_BATCH_ID=.*/RISC0_BATCH_ID=$RISC0_BATCH_ID/")
+        if grep -q "^RISC0_BATCH_ID=" "$env_file"; then
+            # Update existing entry
+            sed -i "s/^RISC0_BATCH_ID=.*/RISC0_BATCH_ID=$RISC0_BATCH_ID/" "$env_file"
+        else
+            # Add new entry
+            echo "RISC0_BATCH_ID=$RISC0_BATCH_ID" >> "$env_file"
+        fi
         print_status "Updated RISC0_BATCH_ID in $env_file: $RISC0_BATCH_ID"
     fi
 
     # Update SP1 VK hashes if provided
     if [ -n "$SP1_AGGREGATION_VK_HASH" ]; then
-        env_content=$(echo "$env_content" | sed "s/^SP1_AGGREGATION_VK_HASH=.*/SP1_AGGREGATION_VK_HASH=$SP1_AGGREGATION_VK_HASH/")
+        if grep -q "^SP1_AGGREGATION_VK_HASH=" "$env_file"; then
+            # Update existing entry
+            sed -i "s/^SP1_AGGREGATION_VK_HASH=.*/SP1_AGGREGATION_VK_HASH=$SP1_AGGREGATION_VK_HASH/" "$env_file"
+        else
+            # Add new entry
+            echo "SP1_AGGREGATION_VK_HASH=$SP1_AGGREGATION_VK_HASH" >> "$env_file"
+        fi
         print_status "Updated SP1_AGGREGATION_VK_HASH in $env_file: $SP1_AGGREGATION_VK_HASH"
     fi
 
     if [ -n "$SP1_BATCH_VK_HASH" ]; then
-        env_content=$(echo "$env_content" | sed "s/^SP1_BATCH_VK_HASH=.*/SP1_BATCH_VK_HASH=$SP1_BATCH_VK_HASH/")
+        if grep -q "^SP1_BATCH_VK_HASH=" "$env_file"; then
+            # Update existing entry
+            sed -i "s/^SP1_BATCH_VK_HASH=.*/SP1_BATCH_VK_HASH=$SP1_BATCH_VK_HASH/" "$env_file"
+        else
+            # Add new entry
+            echo "SP1_BATCH_VK_HASH=$SP1_BATCH_VK_HASH" >> "$env_file"
+        fi
         print_status "Updated SP1_BATCH_VK_HASH in $env_file: $SP1_BATCH_VK_HASH"
     fi
-    
-    # Update Zisk image IDs if provided
-    if [ -n "$ZISK_AGGREGATION_ID" ]; then
-        env_content=$(echo "$env_content" | sed "s/^ZISK_AGGREGATION_ID=.*/ZISK_AGGREGATION_ID=$ZISK_AGGREGATION_ID/")
-        print_status "Updated ZISK_AGGREGATION_ID in $env_file: $ZISK_AGGREGATION_ID"
-    fi
-    
-    if [ -n "$ZISK_BATCH_ID" ]; then
-        env_content=$(echo "$env_content" | sed "s/^ZISK_BATCH_ID=.*/ZISK_BATCH_ID=$ZISK_BATCH_ID/")
-        print_status "Updated ZISK_BATCH_ID in $env_file: $ZISK_BATCH_ID"
-    fi
-    
-    # Write updated content to file
-    echo "$env_content" > "$env_file"
+
     print_status "Successfully updated $env_file"
 }