fix: upstream sync conflicts

emo-eth · Feb 26, 2023 · ad791a5 · ad791a5
2 parents 500df63 + 123917d
commit ad791a5
Show file tree

Hide file tree

Showing 28 changed files with 2,178 additions and 358 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,6 +6,7 @@ members = [
   "huff_utils",
   "huff_cli",
   "huff_parser",
+  "huff_js",
   "huff_tests"
 ]
 exclude = [ "assets", "huffup", "huff-examples" ]

diff --git a/README.md b/README.md
@@ -80,6 +80,7 @@ _Note: Compilation benchmarks were performed on [huff-examples erc20](https://gi
 ## Modules
 * [huff_core](./huff_core): The core module to huff-rs. Resolves source file paths, executes compilation, and exports artifacts.
 * [huff_cli](./huff_cli): The command line interface for the Huff compiler.
+* [huff_js](./huff_js): A wasm compatible interface to the Huff compiler for JavaScript bindings.
 * [huff_lexer](./huff_lexer): Takes in the source of a `.huff` file and generates a vector of `Token`s.
 * [huff_parser](./huff_parser): Crafts a `Contract` AST from the vector of `Token`s generated by [huff_lexer](./huff_lexer).
 * [huff_codegen](./huff_codegen): EVM Bytecode generation module that accepts an AST generated by [huff_parser](./huff_parser).

diff --git a/huff_cli/Cargo.toml b/huff_cli/Cargo.toml
@@ -27,4 +27,4 @@ isatty = "0.1.9"
 [[bin]]
 name = "huffc"
 path = "src/huffc.rs"
-doc = false
+doc = false
diff --git a/huff_cli/src/huffc.rs b/huff_cli/src/huffc.rs
@@ -15,9 +15,12 @@ use huff_tests::{
     prelude::{print_test_report, ReportKind},
     HuffTester,
 };
-use huff_utils::prelude::{
-    export_interfaces, gen_sol_interfaces, str_to_bytes32, unpack_files, AstSpan, CodegenError,
-    CodegenErrorKind, CompilerError, FileSource, Literal, OutputLocation, Span,
+use huff_utils::{
+    file_provider::FileSystemFileProvider,
+    prelude::{
+        export_interfaces, gen_sol_interfaces, str_to_bytes32, unpack_files, AstSpan, CodegenError,
+        CodegenErrorKind, CompilerError, FileSource, Literal, OutputLocation, Span,
+    },
 };
 use isatty::stdout_isatty;
 use spinners::{Spinner, Spinners};
@@ -198,6 +201,7 @@ fn main() {
         optimize: cli.optimize,
         bytecode: cli.bytecode,
         cached: use_cache,
+        file_provider: Arc::new(FileSystemFileProvider {}),
     };
 
     if let Some(TestCommands::Test { format, match_ }) = cli.test {

diff --git a/huff_codegen/Cargo.toml b/huff_codegen/Cargo.toml
@@ -13,10 +13,9 @@ keywords = ["huff", "rust", "ethereum", "bytecode", "compiler"]
 
 [dependencies]
 serde_json = "1.0.81"
-proptest = "1.0.0"
 huff_utils = { path = "../huff_utils" }
 ethers-core = "1.0.2"
 hex = "0.4.3"
 tracing = "0.1.34"
 uuid = { version = "1.1.1", features = ["v4"] }
-regex = "1.6.0"
+regex = "1.6.0"
diff --git a/huff_core/Cargo.toml b/huff_core/Cargo.toml
@@ -13,23 +13,28 @@ keywords = ["huff", "rust", "evm", "bytecode", "compiler"]
 
 [dependencies]
 serde_json = "1.0.81"
-proptest = "1.0.0"
 ethers-core = "1.0.2"
 tracing = "0.1.34"
 huff_codegen = { path = "../huff_codegen" }
 huff_lexer = { path = "../huff_lexer" }
 huff_utils = { path = "../huff_utils" }
 huff_parser = { path = "../huff_parser" }
-rayon = { version = "1.5.3" }
 tracing-subscriber = { version = "0.3", default-features = false, features = ["env-filter", "fmt"] }
 uuid = { version = "1.1.1", features = ["v4"] }
 tracing-test = "0.2.2"
 walkdir = "2"
+cfg-if = "1"
 
 [dev-dependencies]
 criterion = "0.3.5"
 rand = "0.8.5"
 
+[target.'cfg(not(all(target_arch = "wasm32", target_os = "unknown")))'.dependencies]
+rayon = { version = "1.5.3" }
+
+[target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies]
+getrandom = { version = "0.2", features = ["js"] }
+
 [[bench]]
 name = "huff_benchmark"
 harness = false

diff --git a/huff_core/benches/huff_benchmark.rs b/huff_core/benches/huff_benchmark.rs
@@ -3,21 +3,24 @@ use huff_codegen::*;
 use huff_core::Compiler;
 use huff_lexer::*;
 use huff_parser::*;
-use huff_utils::{files, prelude::*};
+use huff_utils::{file_provider::FileSystemFileProvider, files, prelude::*};
 use std::{path::PathBuf, sync::Arc};
 
 fn lex_erc20_from_source_benchmark(c: &mut Criterion) {
-    let file_sources: Vec<Arc<FileSource>> = Compiler::fetch_sources(vec![PathBuf::from(
-        "../huff-examples/erc20/contracts/ERC20.huff".to_string(),
-    )])
+    let file_provider = Arc::new(FileSystemFileProvider::new());
+    let file_sources: Vec<Arc<FileSource>> = Compiler::fetch_sources(
+        vec![PathBuf::from("../huff-examples/erc20/contracts/ERC20.huff".to_string())],
+        file_provider.clone(),
+    )
     .into_iter()
     .map(|p| p.unwrap())
     .collect();
 
     // Recurse file deps + generate flattened source
     let file_source = file_sources.get(0).unwrap();
     let recursed_file_source =
-        Compiler::recurse_deps(Arc::clone(file_source), &files::Remapper::new("./")).unwrap();
+        Compiler::recurse_deps(Arc::clone(file_source), &files::Remapper::new("./"), file_provider)
+            .unwrap();
     let flattened = FileSource::fully_flatten(Arc::clone(&recursed_file_source));
     let full_source = FullFileSource {
         source: &flattened.0,
@@ -35,17 +38,20 @@ fn lex_erc20_from_source_benchmark(c: &mut Criterion) {
 }
 
 fn parse_erc20_benchmark(c: &mut Criterion) {
-    let file_sources: Vec<Arc<FileSource>> = Compiler::fetch_sources(vec![PathBuf::from(
-        "../huff-examples/erc20/contracts/ERC20.huff".to_string(),
-    )])
+    let file_provider = Arc::new(FileSystemFileProvider::new());
+    let file_sources: Vec<Arc<FileSource>> = Compiler::fetch_sources(
+        vec![PathBuf::from("../huff-examples/erc20/contracts/ERC20.huff".to_string())],
+        file_provider.clone(),
+    )
     .into_iter()
     .map(|p| p.unwrap())
     .collect();
 
     // Recurse file deps + generate flattened source
     let file_source = file_sources.get(0).unwrap();
     let recursed_file_source =
-        Compiler::recurse_deps(Arc::clone(file_source), &files::Remapper::new("./")).unwrap();
+        Compiler::recurse_deps(Arc::clone(file_source), &files::Remapper::new("./"), file_provider)
+            .unwrap();
     let flattened = FileSource::fully_flatten(Arc::clone(&recursed_file_source));
     let full_source = FullFileSource {
         source: &flattened.0,
@@ -68,17 +74,20 @@ fn parse_erc20_benchmark(c: &mut Criterion) {
 }
 
 fn codegen_erc20_benchmark(c: &mut Criterion) {
-    let file_sources: Vec<Arc<FileSource>> = Compiler::fetch_sources(vec![PathBuf::from(
-        "../huff-examples/erc20/contracts/ERC20.huff".to_string(),
-    )])
+    let file_provider = Arc::new(FileSystemFileProvider::new());
+    let file_sources: Vec<Arc<FileSource>> = Compiler::fetch_sources(
+        vec![PathBuf::from("../huff-examples/erc20/contracts/ERC20.huff".to_string())],
+        file_provider.clone(),
+    )
     .into_iter()
     .map(|p| p.unwrap())
     .collect();
 
     // Recurse file deps + generate flattened source
     let file_source = file_sources.get(0).unwrap();
     let recursed_file_source =
-        Compiler::recurse_deps(Arc::clone(file_source), &files::Remapper::new("./")).unwrap();
+        Compiler::recurse_deps(Arc::clone(file_source), &files::Remapper::new("./"), file_provider)
+            .unwrap();
     let flattened = FileSource::fully_flatten(Arc::clone(&recursed_file_source));
     let full_source = FullFileSource {
         source: &flattened.0,
@@ -113,16 +122,21 @@ fn codegen_erc20_benchmark(c: &mut Criterion) {
 
 fn erc20_compilation_benchmark(c: &mut Criterion) {
     c.bench_function("Full ERC-20 compilation", |b| b.iter(|| {
+        let file_provider = Arc::new(FileSystemFileProvider::new());
         let file_sources: Vec<Arc<FileSource>> = Compiler::fetch_sources(vec![PathBuf::from(
             "../huff-examples/erc20/contracts/ERC20.huff".to_string(),
-        )])
+        )], file_provider.clone())
             .into_iter()
             .map(|p| p.unwrap())
             .collect();
 
         // Recurse file deps + generate flattened source
         let file_source = file_sources.get(0).unwrap();
-        let recursed_file_source = Compiler::recurse_deps(Arc::clone(file_source), &files::Remapper::new("./")).unwrap();
+        let recursed_file_source = Compiler::recurse_deps(
+            Arc::clone(file_source),
+            &files::Remapper::new("./"),
+            file_provider
+        ).unwrap();
         let flattened = FileSource::fully_flatten(Arc::clone(&recursed_file_source));
         let full_source = FullFileSource {
             source: &flattened.0,
@@ -153,16 +167,21 @@ fn erc20_compilation_benchmark(c: &mut Criterion) {
 
 fn erc721_compilation_benchmark(c: &mut Criterion) {
     c.bench_function("Full ERC-721 compilation", |b| b.iter(|| {
+        let file_provider = Arc::new(FileSystemFileProvider::new());
         let file_sources: Vec<Arc<FileSource>> = Compiler::fetch_sources(vec![PathBuf::from(
             "../huff-examples/erc721/contracts/ERC721.huff".to_string(),
-        )])
+        )], file_provider.clone())
             .into_iter()
             .map(|p| p.unwrap())
             .collect();
 
         // Recurse file deps + generate flattened source
         let file_source = file_sources.get(0).unwrap();
-        let recursed_file_source = Compiler::recurse_deps(Arc::clone(file_source), &files::Remapper::new("./")).unwrap();
+        let recursed_file_source = Compiler::recurse_deps(
+            Arc::clone(file_source),
+            &files::Remapper::new("./"),
+            file_provider
+        ).unwrap();
         let flattened = FileSource::fully_flatten(Arc::clone(&recursed_file_source));
         let full_source = FullFileSource {
             source: &flattened.0,