tweak

Author: 0xmovses

protocol-units/zkfp/eth-zk/host/src/compiler.rs

@@ -1,20 +1,30 @@
-use std::path::Path;
-
 use anyhow::Result;
+use serde::Serialize;
+use std::path::PathBuf;
 
-pub fn compile_units(s: &str) -> Result<Vec<()>> {
-    Ok(vec![])
-}
+use foundry_compilers::{info::ContractInfo, Artifact, Project, ProjectCompileOutput, ProjectPathsConfig};
 
-fn expect_contracts(units: impl IntoIterator<Item = ()>) -> impl Iterator<Item = Result<()>> {
-    units.into_iter().map(|_| Ok(()))
-}
+/// Makes a foo function that is compatible with the expectations of the guest code.
+pub fn compile_foo() -> Vec<u8> {
+    let root = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    let paths = ProjectPathsConfig::builder()
+        .sources(root.join("contracts"))
+        .build()
+        .unwrap();
+    let project = Project::builder()
+        .paths(paths)
+        .no_artifacts()
+        .build()
+        .unwrap();
 
-pub fn compile_contracts_in_file(_path: &Path) -> Result<Vec<()>> {
-    Ok(vec![])
+    let compiled = project.compile().unwrap();
+    let info = ContractInfo::new("contracts/Foo.sol:Foo");
+    let bytes = compiled
+        .find_contract(info)
+        .expect("Could not find contract")
+        .get_bytecode_bytes()
+        .unwrap()
+        .to_vec();
+    println!("Compiled foo: {:?}", bytes);
+    bytes
 }
-
-#[allow(dead_code)]
-pub fn as_contract(_unit: ()) -> () {
-    ()
-}

protocol-units/zkfp/eth-zk/host/src/compiler_examples.rs

@@ -1,7 +1,6 @@
 // These constants represent the RISC-V ELF and the image ID generated by risc0-build.
 // The ELF is used for proving and the ID is used for verification.
 pub mod compiler;
-pub mod compiler_examples;
 use methods::{GUEST_ELF, GUEST_ID};
 use risc0_zkvm::{default_prover, ExecutorEnv};
 
@@ -24,7 +23,7 @@ fn main() {
     // ExecutorEnvBuilder::build().
 
     // For example:
-    let input: Vec<u8> = compiler_examples::return_u64();
+    let input: Vec<u8> = compiler::compile_foo();
     let env = ExecutorEnv::builder()
         .write(&input)
         .unwrap()