Merge bd36562 into df08874

AztecProtocol · Jul 23, 2024 · be44da9 · be44da9
2 parents df08874 + bd36562
commit be44da9
Show file tree

Hide file tree

Showing 257 changed files with 15,830 additions and 7,252 deletions.
diff --git a/avm-transpiler/Cargo.lock b/avm-transpiler/Cargo.lock
diff --git a/noir/noir-repo/.github/workflows/test-js-packages.yml b/noir/noir-repo/.github/workflows/test-js-packages.yml
@@ -517,8 +517,8 @@ jobs:
       fail-fast: false
       matrix:
         project:
-         - { repo: AztecProtocol/aztec-nr, path: ./ }
-         - { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts }
+        #  - { repo: AztecProtocol/aztec-nr, path: ./ }
+        #  - { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts }
          # Disabled as aztec-packages requires a setup-step in order to generate a `Nargo.toml`
          #- { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits }
          - { repo: zac-williamson/noir-edwards, path: ./, ref: 0016ce82cd58b6ebb0c43c271725590bcff4e755  }

diff --git a/noir/noir-repo/.release-please-manifest.json b/noir/noir-repo/.release-please-manifest.json
@@ -1,4 +1,4 @@
 {
-  ".": "0.31.0",
-  "acvm-repo": "0.47.0"
+  ".": "0.32.0",
+  "acvm-repo": "0.48.0"
 }
diff --git a/noir/noir-repo/CHANGELOG.md b/noir/noir-repo/CHANGELOG.md
diff --git a/noir/noir-repo/Cargo.lock b/noir/noir-repo/Cargo.lock
diff --git a/noir/noir-repo/Cargo.toml b/noir/noir-repo/Cargo.toml
@@ -42,7 +42,7 @@ resolver = "2"
 
 [workspace.package]
 # x-release-please-start-version
-version = "0.31.0"
+version = "0.32.0"
 # x-release-please-end
 authors = ["The Noir Team <[email protected]>"]
 edition = "2021"
@@ -53,13 +53,13 @@ repository = "https://github.com/noir-lang/noir/"
 [workspace.dependencies]
 
 # ACVM workspace dependencies
-acir_field = { version = "0.47.0", path = "acvm-repo/acir_field", default-features = false }
-acir = { version = "0.47.0", path = "acvm-repo/acir", default-features = false }
-acvm = { version = "0.47.0", path = "acvm-repo/acvm" }
-brillig = { version = "0.47.0", path = "acvm-repo/brillig", default-features = false }
-brillig_vm = { version = "0.47.0", path = "acvm-repo/brillig_vm", default-features = false }
-acvm_blackbox_solver = { version = "0.47.0", path = "acvm-repo/blackbox_solver", default-features = false }
-bn254_blackbox_solver = { version = "0.47.0", path = "acvm-repo/bn254_blackbox_solver", default-features = false }
+acir_field = { version = "0.48.0", path = "acvm-repo/acir_field", default-features = false }
+acir = { version = "0.48.0", path = "acvm-repo/acir", default-features = false }
+acvm = { version = "0.48.0", path = "acvm-repo/acvm" }
+brillig = { version = "0.48.0", path = "acvm-repo/brillig", default-features = false }
+brillig_vm = { version = "0.48.0", path = "acvm-repo/brillig_vm", default-features = false }
+acvm_blackbox_solver = { version = "0.48.0", path = "acvm-repo/blackbox_solver", default-features = false }
+bn254_blackbox_solver = { version = "0.48.0", path = "acvm-repo/bn254_blackbox_solver", default-features = false }
 
 # Noir compiler workspace dependencies
 fm = { path = "compiler/fm" }