Merge branch 'main' into feat/leaky_relu2

zkonduit · Dec 5, 2022 · e1fae3c · e1fae3c
2 parents 520caaa + 7d86386
commit e1fae3c
Show file tree

Hide file tree

Showing 38 changed files with 302 additions and 7,144 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -16,6 +16,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+      with:
+          submodules: recursive
     - uses: actions-rs/toolchain@v1
       with:
           toolchain: nightly

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "examples/onnx"]
+	path = examples/onnx
+	url = https://github.com/zkonduit/onnx-examples
+	branch = main
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,8 +24,9 @@ log = { version = "0.4.17", optional = true }
 colog = { version = "1.1.0", optional = true }
 tabled = { version = "0.9.0", optional = true}
 # evm related deps
-ethereum_types = { package = "ethereum-types", version = "0.13.1", default-features = false, features = ["std"], optional=true}
-foundry_evm = { git = "https://github.com/foundry-rs/foundry", package = "foundry-evm", rev = "6b1ee60e", optional=true }
+hashbrown = "0.13"
+ethereum_types = { package = "ethereum-types", version = "0.14", default-features = false, features = ["std"], optional=true}
+foundry_evm = { git = "https://github.com/foundry-rs/foundry", package = "foundry-evm", rev = "b28119b56d7dd18c268a471167a0c547c301c13e", optional=true }
 halo2_wrong_ecc = { git = "https://github.com/privacy-scaling-explorations/halo2wrong", tag = "v2022_10_22", package = "ecc"}
 plonk_verifier = {  git = "https://github.com/privacy-scaling-explorations/plonk-verifier.git", tag = "v2022_10_22"}
 

diff --git a/README.md b/README.md
diff --git a/examples/onnx b/examples/onnx
diff --git a/examples/onnx_models/1lcnvrl.onnx b/examples/onnx_models/1lcnvrl.onnx