From 2ea6a00b7ff2946c0c2ecd09b5e54090bf79d340 Mon Sep 17 00:00:00 2001 From: Kamen Mladenov Date: Fri, 31 Jan 2025 11:06:41 +0200 Subject: feat(zkvms/zkm): Update Cargo.lock and use default environments --- zkvms/zkm/host/Cargo.lock | 150 ++++++++++++++++++++++++++++++++------------- zkvms/zkm/host/src/main.rs | 29 +++++---- 2 files changed, 124 insertions(+), 55 deletions(-) (limited to 'zkvms/zkm/host') diff --git a/zkvms/zkm/host/Cargo.lock b/zkvms/zkm/host/Cargo.lock index f82c462..c36f6ba 100644 --- a/zkvms/zkm/host/Cargo.lock +++ b/zkvms/zkm/host/Cargo.lock @@ -345,9 +345,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.56.0" +version = "1.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12e057fdcb8842de9b83592a70f5b4da0ee10bc0ad278247da1425a742a444d7" +checksum = "c54bab121fe1881a74c338c5f723d1592bf3b53167f80268a1274f404e1acc38" dependencies = [ "aws-credential-types", "aws-runtime", @@ -367,9 +367,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.57.1" +version = "1.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a120ade4a44691b3c5c2ff2fa61b14ed331fdc218397f61ab48d66593012ae2a" +checksum = "8c8234fd024f7ac61c4e44ea008029bde934250f371efe7d4a39708397b1080c" dependencies = [ "aws-credential-types", "aws-runtime", @@ -389,9 +389,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.57.0" +version = "1.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "115fd4fb663817ed595a5ee4f1649d7aacd861d47462323cb37576ce89271b93" +checksum = "ba60e1d519d6f23a9df712c04fdeadd7872ac911c84b2f62a8bda92e129b7962" dependencies = [ "aws-credential-types", "aws-runtime", @@ -727,6 +727,12 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" +[[package]] +name = "beef" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" + [[package]] name = "bincode" version = "1.3.3" @@ -1075,26 +1081,6 @@ dependencies = [ "tiny-keccak", ] -[[package]] -name = "const_format" -version = "0.2.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd" -dependencies = [ - "const_format_proc_macros", -] - -[[package]] -name = "const_format_proc_macros" -version = "0.2.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - [[package]] name = "constant_time_eq" version = "0.1.5" @@ -1356,6 +1342,12 @@ dependencies = [ "syn 2.0.96", ] +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + [[package]] name = "digest" version = "0.10.7" @@ -1571,6 +1563,17 @@ dependencies = [ "zeroize", ] +[[package]] +name = "env-file-reader" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0a86dcbc0fd1a07f5c318a2215338f0c870336851e8b566ebef1576eddb3728" +dependencies = [ + "lalrpop 0.19.12", + "lalrpop-util 0.19.12", + "logos", +] + [[package]] name = "env_logger" version = "0.9.3" @@ -2925,6 +2928,28 @@ dependencies = [ "tiny-keccak", ] +[[package]] +name = "lalrpop" +version = "0.19.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b" +dependencies = [ + "ascii-canvas", + "bit-set", + "diff", + "ena", + "is-terminal", + "itertools 0.10.5", + "lalrpop-util 0.19.12", + "petgraph", + "regex", + "regex-syntax 0.6.29", + "string_cache", + "term", + "tiny-keccak", + "unicode-xid", +] + [[package]] name = "lalrpop" version = "0.20.2" @@ -2935,10 +2960,10 @@ dependencies = [ "bit-set", "ena", "itertools 0.11.0", - "lalrpop-util", + "lalrpop-util 0.20.2", "petgraph", "regex", - "regex-syntax", + "regex-syntax 0.8.5", "string_cache", "term", "tiny-keccak", @@ -2946,6 +2971,15 @@ dependencies = [ "walkdir", ] +[[package]] +name = "lalrpop-util" +version = "0.19.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed" +dependencies = [ + "regex", +] + [[package]] name = "lalrpop-util" version = "0.20.2" @@ -3005,6 +3039,29 @@ version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" +[[package]] +name = "logos" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf8b031682c67a8e3d5446840f9573eb7fe26efe7ec8d195c9ac4c0647c502f1" +dependencies = [ + "logos-derive", +] + +[[package]] +name = "logos-derive" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d849148dbaf9661a6151d1ca82b13bb4c4c128146a88d05253b38d4e2f496c" +dependencies = [ + "beef", + "fnv", + "proc-macro2", + "quote", + "regex-syntax 0.6.29", + "syn 1.0.109", +] + [[package]] name = "lru" version = "0.12.5" @@ -3323,30 +3380,28 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.7.2" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91c2d9a6a6004e205b7e881856fb1a0f5022d382acc2c01b52185f7b6f65997" +checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" dependencies = [ "arrayvec", "bitvec", "byte-slice-cast", - "const_format", "impl-trait-for-tuples", "parity-scale-codec-derive", - "rustversion", "serde", ] [[package]] name = "parity-scale-codec-derive" -version = "3.7.2" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77555fd9d578b6470470463fded832619a5fec5ad6cbc551fe4d7507ce50cd3a" +checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.96", + "syn 1.0.109", ] [[package]] @@ -3754,7 +3809,7 @@ dependencies = [ "rand", "rand_chacha", "rand_xorshift", - "regex-syntax", + "regex-syntax 0.8.5", "unarray", ] @@ -3915,7 +3970,7 @@ dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax", + "regex-syntax 0.8.5", ] [[package]] @@ -3926,7 +3981,7 @@ checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.8.5", ] [[package]] @@ -3935,6 +3990,12 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + [[package]] name = "regex-syntax" version = "0.8.5" @@ -4547,8 +4608,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c425ce1c59f4b154717592f0bdf4715c3a1d55058883622d3157e1f0908a5b26" dependencies = [ "itertools 0.11.0", - "lalrpop", - "lalrpop-util", + "lalrpop 0.20.2", + "lalrpop-util 0.20.2", "phf", "thiserror 1.0.69", "unicode-xid", @@ -5011,9 +5072,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.22" +version = "0.22.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee" dependencies = [ "indexmap 2.7.1", "serde", @@ -5651,9 +5712,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.25" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad699df48212c6cc6eb4435f35500ac6fd3b9913324f938aea302022ce19d310" +checksum = "7e49d2d35d3fad69b39b94139037ecfb4f359f08958b9c11e7315ce770462419" dependencies = [ "memchr", ] @@ -5920,6 +5981,7 @@ name = "zkvms_host_io" version = "0.1.0" dependencies = [ "clap", + "env-file-reader", "input_macros", "num-traits", "serde", diff --git a/zkvms/zkm/host/src/main.rs b/zkvms/zkm/host/src/main.rs index e16177c..24b4e92 100644 --- a/zkvms/zkm/host/src/main.rs +++ b/zkvms/zkm/host/src/main.rs @@ -1,8 +1,5 @@ -use anyhow::bail; -use anyhow::Result; -use std::env; -use std::fs::read; -use std::time::Instant; +use anyhow::{bail, Result}; +use std::{env, fs::read, time::Instant}; use zkm_sdk::{prover::ClientCfg, prover::{ProverInput, ProverResult} , ProverClient}; use zkvms_host_io::{read_args, RunType::{ Execute, Prove, Verify }}; @@ -69,15 +66,25 @@ async fn main() -> Result<()> { panic!("Off-chain verification is not supported!"); } - let seg_size = env::var("SEG_SIZE") - .ok() - .and_then(|seg| seg.parse::().ok()) - .unwrap_or(8192); + let seg_size: u32 = run_info + .env_then_or( + "SEG_SIZE", + |seg| seg.parse::().ok(), + 65536, + ); let elf_path = env::var("ELF_PATH").expect("ELF PATH is missing"); - let proof_results_path = env::var("PROOF_RESULTS_PATH").unwrap_or("/tmp/contracts".to_string()); - let vk_path = env::var("VERIFYING_KEY_PATH").unwrap_or("/tmp/input".to_string()); + let proof_results_path = run_info + .env_or( + "PROOF_RESULTS_PATH", + "/tmp/contracts", + ); + let vk_path = run_info + .env_or( + "VERIFYING_KEY_PATH", + "/tmp/input", + ); let mut client_config: ClientCfg = ClientCfg::new("local".to_string(), vk_path.to_owned()); -- cgit v1.2.3