Skip to content

Commit

Permalink
fix: update data identity
Browse files Browse the repository at this point in the history
  • Loading branch information
eigmax committed Mar 30, 2024
1 parent 05e9aa6 commit 0f4658d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
3 changes: 2 additions & 1 deletion zkvm/program/evm/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ use alloc::string::String;
use alloc::string::ToString;

use k256::ecdsa::SigningKey;
const TEST_CHANNEL: u32 = 1;

/// Recover the address from a private key (SigningKey).
pub fn recover_address(private_key: &[u8]) -> Option<Address> {
Expand All @@ -28,7 +29,7 @@ pub fn recover_address(private_key: &[u8]) -> Option<Address> {

#[no_mangle]
fn main() {
let suite_json: String = get_data_serde(666);
let suite_json: String = get_data_serde(TEST_CHANNEL);
print!("suite_json: {suite_json}\n");
let suite = read_suite(&suite_json);

Expand Down
11 changes: 5 additions & 6 deletions zkvm/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
use anyhow::Result;
use powdr::backend::BackendType;
use powdr::number::{DegreeType, FieldElement, GoldilocksField};
use powdr::riscv::continuations::{
bootloader::default_input, rust_continuations, rust_continuations_dry_run,
};
use powdr::riscv::continuations::{rust_continuations, rust_continuations_dry_run};
use powdr::riscv::{compile_rust, CoProcessors};
use powdr::Pipeline;
use recursion::pilcom::export as pil_export;
Expand Down Expand Up @@ -120,6 +118,7 @@ pub fn zkvm_evm_execute_and_prove(task: &str, suite_json: String, output_path: &
let duration = start.elapsed();
log::debug!("Computing fixed columns took: {:?}", duration);

/*
log::debug!("Running powdr-riscv executor in fast mode...");
let start = Instant::now();
Expand All @@ -130,10 +129,10 @@ pub fn zkvm_evm_execute_and_prove(task: &str, suite_json: String, output_path: &
&default_input(&[]),
powdr::riscv_executor::ExecMode::Fast,
);

let duration = start.elapsed();
log::debug!("Fast executor took: {:?}", duration);
log::debug!("Trace length: {}", trace.len);
*/

log::debug!("Running powdr-riscv executor in trace mode for continuations...");
let start = Instant::now();
Expand Down Expand Up @@ -180,6 +179,7 @@ pub fn zkvm_evm_generate_chunks(

log::debug!("Running powdr-riscv executor in fast mode...");

/*
let (trace, _mem) = powdr::riscv_executor::execute::<GoldilocksField>(
&asm_contents,
powdr::riscv_executor::MemoryState::new(),
Expand All @@ -189,7 +189,7 @@ pub fn zkvm_evm_generate_chunks(
);
log::debug!("Trace length: {}", trace.len);

*/
log::debug!("Running powdr-riscv executor in trace mode for continuations...");
let start = Instant::now();

Expand Down Expand Up @@ -279,7 +279,6 @@ mod tests {

// RUST_MIN_STACK=2073741821 RUST_LOG=debug proxychains nohup cargo test --release test_zkvm_evm_prove -- --nocapture &
#[test]
#[ignore]
fn test_zkvm_evm_prove() {
env_logger::try_init().unwrap_or_default();
//let test_file = "test-vectors/blockInfo.json";
Expand Down

0 comments on commit 0f4658d

Please sign in to comment.