Merge branch 'main' into feat/zkvm-for-pacaya

Author: smtmfft

Dockerfile

@@ -13,7 +13,9 @@ RUN ego-go build -o gaiko-ego ./cmd/gaiko
 # Sign with our enclave config and private key
 COPY gaiko/ego/enclave.json .
 COPY docker/enclave-key.pem private.pem
-RUN ego sign && ego bundle gaiko-ego gaiko && ego uniqueid gaiko-ego
+RUN ego sign && ego bundle gaiko-ego gaiko
+RUN ego uniqueid gaiko-ego
+RUN ego signerid gaiko-ego
 
 FROM rust:1.85.0 AS chef
 RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash

RELEASE.md

@@ -0,0 +1,31 @@
+# v1.7.0
+
+## image
+
+us-docker.pkg.dev/evmchain/images/raiko:1.7.0
+
+## gaiko
+
+- mrenclave: 0f70dbd91a6c39460e3e8d5a5037220d4115995c15d72a2d57cc93fe7c24ecce
+- mrsigner: ca0583a715534a8c981b914589a7f0dc5d60959d9ae79fb5353299a4231673d5
+
+## raiko
+
+- mrenclave: b1190d92e7abe39f2987ef5e3df90b98220b584f4372a45bea1b467a997f6839
+- mrsigner: ca0583a715534a8c981b914589a7f0dc5d60959d9ae79fb5353299a4231673d5
+
+# v1.7.0-edmm
+
+## image
+
+us-docker.pkg.dev/evmchain/images/raiko:1.7.0-edmm
+
+## gaiko
+
+- mrenclave: 0f70dbd91a6c39460e3e8d5a5037220d4115995c15d72a2d57cc93fe7c24ecce
+- mrsigner: ca0583a715534a8c981b914589a7f0dc5d60959d9ae79fb5353299a4231673d5
+
+## raiko
+
+- mrenclave: b5cd6a283fcd221ffa893f56e8d9d533e07a2ece7e772d68c22949fd4783d16c
+- mrsigner: ca0583a715534a8c981b914589a7f0dc5d60959d9ae79fb5353299a4231673d5

ballot/src/lib.rs

@@ -29,7 +29,7 @@ impl Ballot {
     pub fn validate(&self) -> Result<(), String> {
         // Validate each probability
         for (&proof_type, &prob) in self.probabilities.iter() {
-            if 0.0 > prob && 1.0 < prob {
+            if !(0.0..=1.0).contains(&prob) {
                 return Err(format!(
                     "Invalid probability value {} for proof type {:?}, must be between 0 and 1",
                     prob, proof_type

core/src/lib.rs

@@ -451,11 +451,17 @@ mod tests {
             .generate_batch_input(provider)
             .await
             .expect("input generation failed");
+        // let filename = format!("batch-input-{}.json", proof_request.batch_id);
+        // let writer = std::fs::File::create(&filename).expect("Unable to create file");
+        // serde_json::to_writer(writer, &input).expect("Unable to write data");
         trace!("batch guest input: {input:?}");
         let output = raiko
             .get_batch_output(&input)
             .expect("output generation failed");
         debug!("batch guest output: {output:?}");
+        // let filename = format!("batch-output-{}.json", proof_request.batch_id);
+        // let writer = std::fs::File::create(&filename).expect("Unable to create file");
+        // serde_json::to_writer(writer, &output).expect("Unable to write data");
         raiko
             .batch_prove(input, &output, None)
             .await
@@ -492,6 +498,33 @@ mod tests {
         batch_prove_block(l1_chain_spec, taiko_chain_spec, proof_request).await;
     }
 
+    #[ignore]
+    #[tokio::test(flavor = "multi_thread")]
+    async fn test_prove_batch_block_taiko_a7() {
+        env_logger::init();
+        let proof_type = get_proof_type_from_env();
+        let l1_network = "holesky".to_owned();
+        let network = "taiko_a7".to_owned();
+        let chain_specs = SupportedChainSpecs::default();
+        let taiko_chain_spec = chain_specs.get_chain_spec(&network).unwrap();
+        let l1_chain_spec = chain_specs.get_chain_spec(&l1_network).unwrap();
+
+        let proof_request = ProofRequest {
+            block_number: 0,
+            batch_id: 1306738,
+            l1_inclusion_block_number: 3606914,
+            l2_block_numbers: vec![1306738],
+            network,
+            graffiti: B256::ZERO,
+            prover: Address::ZERO,
+            l1_network,
+            proof_type,
+            blob_proof_type: BlobProofType::ProofOfEquivalence,
+            prover_args: test_proof_params(false),
+        };
+        batch_prove_block(l1_chain_spec, taiko_chain_spec, proof_request).await;
+    }
+
     #[ignore]
     #[tokio::test(flavor = "multi_thread")]
     async fn test_batch_prove_block_taiko_mainnet() {

docs/README_Docker_and_RA.md

@@ -368,30 +368,7 @@ pnpm install
 pnpm compile
 ```
 
-3. Ensure the values in the `script/layer1/provers/config_dcap_sgx_verifier.sh` script match whichever network you are registering for.
-
-> **_NOTE:_** You will have to do this step twice for Hekla: once for the Ontake addresses and once for the Pacaya addresses. Please keep both SGX_INSTANCE_IDs.
-
-Hekla Ontake Addresses:
-`SGX_VERIFIER_ADDRESS`=0x532EFBf6D62720D0B2a2Bb9d11066E8588cAE6D9 
-`ATTESTATION_ADDRESS`=0xC6cD3878Fc56F2b2BaB0769C580fc230A95e1398 
-`PEM_CERTCHAIN_ADDRESS`=0x08d7865e7F534d743Aba5874A9AD04bcB223a92E 
-
-Hekla Pacaya Addresses:
-`SGX_VERIFIER_ADDRESS`=0xa8cD459E3588D6edE42177193284d40332c3bcd4
-`ATTESTATION_ADDRESS`=0xC6cD3878Fc56F2b2BaB0769C580fc230A95e1398
-`PEM_CERTCHAIN_ADDRESS`=0x08d7865e7F534d743Aba5874A9AD04bcB223a92E
-
-Mainnet Addresses:
-`SGX_VERIFIER_ADDRESS`=0xb0f3186FC1963f774f52ff455DC86aEdD0b31F81
-`ATTESTATION_ADDRESS`=0x8d7C954960a36a7596d7eA4945dDf891967ca8A3
-`PEM_CERTCHAIN_ADDRESS`=0x02772b7B3a5Bea0141C993Dbb8D0733C19F46169
-
-These values are already in the script, it defaults to Hekla; please comment those lines out and uncomment the Mainnet ones if performing RA on Mainnet.
-
-4. In the `script/layer1/provers/config_dcap_sgx_verifier.sh` script, replace `--fork-url https://any-holesky-rpc-url/` with the RPC URL of the hekla/mainnet network. Alternatively, export it like so: `export FORK_URL="https://any-holesky-rpc-url/"`.
-
-5. If you've followed the Raiko Docker guide, you will have bootstrapped raiko and obtained a quote:
+3. If you've followed the Raiko Docker guide, you will have bootstrapped raiko and obtained a quote:
 
 ```
 "public_key": "0x02ab85f14dcdc93832f4bb9b40ad908a5becb840d36f64d21645550ba4a2b28892",
@@ -401,11 +378,13 @@ These values are already in the script, it defaults to Hekla; please comment tho
 
 You can find it with `cat ~/.config/raiko/config/bootstrap.json` as shown above.
 
-Copy your quote and use in the following step.
+4. Export an RPC url for the L1 network you are registering for. i.e. `FORK_URL=https://any_holesky_rpc_url/` for Hekla.
+
+5. Call the script with `PRIVATE_KEY=0x{YOUR_PRIVATE_KEY} ./script/layer1/provers/config_dcap_sgx_verifier.sh --env {NETWORK} --quote {YOUR_QUOTE_HERE}`. "YOUR_QUOTE_HERE" comes from above step 5.
 
-6. Call the script with `PRIVATE_KEY=0x{YOUR_PRIVATE_KEY} ./script/layer1/config_dcap_sgx_verifier.sh --quote {YOUR_QUOTE_HERE}`. "YOUR_QUOTE_HERE" comes from above step 5.
+`NETWORK` will be `hekla-<ontake|pacaya|pivot>` or `mainnet` depending on which verifier you are registering to.
 
-> **_NOTE:_** You can use the same command for registering both verifiers, just comment out the Ontake addresses and uncomment the Pacaya ones in the script and re-run. 
+> **_NOTE:_** You will have to do this step twice for Hekla: once for Ontake and once for Pacaya. Please keep both SGX_INSTANCE_IDs.
 
 7. If you've been successful, you will get a SGX instance `id` which can be used to run Raiko!
 
@@ -424,7 +403,7 @@ Once you've completed the above steps, you can actually run a prover.
 
 Raiko now supports more configurations, which need to be carefully checked to avoid errors.
 
-> **_NOTE:_** We have deprecated `SGX_INSTANCE_ID`, if you only register with the Ontake addresses please export to `SGX_ONTAKE_INSTANCE_ID`.
+> **_NOTE:_** We have deprecated `SGX_INSTANCE_ID`, if you only register for Pacaya please export to `SGX_PACAYA_INSTANCE_ID`.
 
     - SGX_ONTAKE_INSTANCE_ID: SGX registered ID for ontake fork. (if raiko start before/in ontake, set this one)
     - SGX_PACAYA_INSTANCE_ID: SGX registered ID for pacaya fork. (if raiko start before/in pacaya, set this one)

gaiko

@@ -115,7 +115,7 @@
                 "SGX": "0xa8cD459E3588D6edE42177193284d40332c3bcd4",
                 "SP1": "0x1138aA994477f0880001aa1E8106D749035b6250",
                 "RISC0": "0xCDdf353C838542834E443C3c9dE3ab3F81F27aF2",
-                "PIVOT": "0x9016078d9870e432cb47122609F83DeE025bC060"
+                "PIVOT": "0x4361B85093720bD50d25236693CA58FD6e1b3a53"
             }
         },
         "genesis_time": 0,

host/config/chain_spec_list_default.json

@@ -31,7 +31,7 @@ pub(crate) async fn setup_bootstrap(
     // Block until the lock is acquired.
     // Create the lock file if it does not exist.
     // Drop the lock file when the lock goes out of scope by drop guard.
-    let _filelock = FileLock::lock(
+    let filelock = FileLock::lock(
         config_dir.join("bootstrap.lock"),
         true,
         FileOptions::new().create(true).write(true),
@@ -43,7 +43,9 @@ pub(crate) async fn setup_bootstrap(
         ProofType::Sgx,
     )
     .await?;
-    setup_bootstrap_inner(secret_dir, config_dir, bootstrap_args, ProofType::Pivot).await
+    setup_bootstrap_inner(secret_dir, config_dir, bootstrap_args, ProofType::Pivot).await?;
+    drop(filelock);
+    Ok(())
 }
 
 pub(crate) async fn setup_bootstrap_inner(
@@ -123,10 +125,10 @@ pub(crate) async fn setup_bootstrap_inner(
                 fork_register_id.insert(*spec_id, register_id);
             }
         }
-        println!("Saving instance id {registered_fork_ids:?}");
         // set check file
         set_instance_id(&config_dir, proof_type, &fork_register_id)?;
         registered_fork_ids = Some(fork_register_id);
+        println!("Saving instance id {registered_fork_ids:?}");
     }
     // Always reset the configuration with a persistent instance ID upon restart.
     let file = File::open(&bootstrap_args.config_path)?;
@@ -140,6 +142,7 @@ pub(crate) async fn setup_bootstrap_inner(
     let new_config_path = config_dir.join("config.sgx.json");
     println!("Saving bootstrap data file {}", new_config_path.display());
     let json = serde_json::to_string_pretty(&file_config)?;
+    println!("Saving config content {}", json);
     fs::write(&new_config_path, json).context(format!(
         "Saving bootstrap data file {} failed",
         new_config_path.display()

provers/sgx/setup/src/setup_bootstrap.rs

@@ -23,5 +23,6 @@ docker buildx build ./ \
 	--progress=plain
 
 docker tag raiko:$tag us-docker.pkg.dev/evmchain/images/raiko:$tag
+docker tag raiko:$tag ghcr.io/evmchain/raiko:$tag
 
 echo "Done"