Skip to content

Commit

Permalink
Merge branch 'master' into gd/issue_6594
Browse files Browse the repository at this point in the history
  • Loading branch information
guipublic authored Dec 23, 2024
2 parents 6eb3427 + 011fbc1 commit 3c5997d
Show file tree
Hide file tree
Showing 176 changed files with 13,916 additions and 70 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/reports.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
- name: Compare gates reports
id: gates_diff
uses: noir-lang/noir-gates-diff@1931aaaa848a1a009363d6115293f7b7fc72bb87
uses: noir-lang/noir-gates-diff@84ada11295b9a1e1da7325af4e45e2db9f775175
with:
report: gates_report.json
summaryQuantile: 0.9 # only display the 10% most significant circuit size diffs in the summary (defaults to 20%)
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
- name: Compare Brillig bytecode size reports
id: brillig_bytecode_diff
uses: noir-lang/noir-gates-diff@d88f7523b013b9edd3f31c5cfddaef87a3fe1b48
uses: noir-lang/noir-gates-diff@84ada11295b9a1e1da7325af4e45e2db9f775175
with:
report: gates_report_brillig.json
header: |
Expand Down Expand Up @@ -170,7 +170,7 @@ jobs:
- name: Compare Brillig execution reports
id: brillig_execution_diff
uses: noir-lang/noir-gates-diff@d88f7523b013b9edd3f31c5cfddaef87a3fe1b48
uses: noir-lang/noir-gates-diff@84ada11295b9a1e1da7325af4e45e2db9f775175
with:
report: gates_report_brillig_execution.json
header: |
Expand Down
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "1.0.0-beta.0"
".": "1.0.0-beta.1"
}
101 changes: 101 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

56 changes: 28 additions & 28 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ resolver = "2"

[workspace.package]
# x-release-please-start-version
version = "1.0.0-beta.0"
version = "1.0.0-beta.1"
# x-release-please-end
authors = ["The Noir Team <team@noir-lang.org>"]
edition = "2021"
Expand All @@ -57,13 +57,13 @@ unused_qualifications = "warn"
[workspace.dependencies]

# ACVM workspace dependencies
acir_field = { version = "1.0.0-beta.0", path = "acvm-repo/acir_field", default-features = false }
acir = { version = "1.0.0-beta.0", path = "acvm-repo/acir", default-features = false }
acvm = { version = "1.0.0-beta.0", path = "acvm-repo/acvm" }
brillig = { version = "1.0.0-beta.0", path = "acvm-repo/brillig", default-features = false }
brillig_vm = { version = "1.0.0-beta.0", path = "acvm-repo/brillig_vm", default-features = false }
acvm_blackbox_solver = { version = "1.0.0-beta.0", path = "acvm-repo/blackbox_solver", default-features = false }
bn254_blackbox_solver = { version = "1.0.0-beta.0", path = "acvm-repo/bn254_blackbox_solver", default-features = false }
acir_field = { version = "1.0.0-beta.1", path = "acvm-repo/acir_field", default-features = false }
acir = { version = "1.0.0-beta.1", path = "acvm-repo/acir", default-features = false }
acvm = { version = "1.0.0-beta.1", path = "acvm-repo/acvm" }
brillig = { version = "1.0.0-beta.1", path = "acvm-repo/brillig", default-features = false }
brillig_vm = { version = "1.0.0-beta.1", path = "acvm-repo/brillig_vm", default-features = false }
acvm_blackbox_solver = { version = "1.0.0-beta.1", path = "acvm-repo/blackbox_solver", default-features = false }
bn254_blackbox_solver = { version = "1.0.0-beta.1", path = "acvm-repo/bn254_blackbox_solver", default-features = false }

# Noir compiler workspace dependencies
fm = { path = "compiler/fm" }
Expand Down
2 changes: 1 addition & 1 deletion acvm-repo/acir/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "acir"
description = "ACIR is the IR that the VM processes, it is analogous to LLVM IR"
# x-release-please-start-version
version = "1.0.0-beta.0"
version = "1.0.0-beta.1"
# x-release-please-end
authors.workspace = true
edition.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion acvm-repo/acir_field/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "acir_field"
description = "The field implementation being used by ACIR."
# x-release-please-start-version
version = "1.0.0-beta.0"
version = "1.0.0-beta.1"
# x-release-please-end
authors.workspace = true
edition.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion acvm-repo/acvm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "acvm"
description = "The virtual machine that processes ACIR given a backend/proof system."
# x-release-please-start-version
version = "1.0.0-beta.0"
version = "1.0.0-beta.1"
# x-release-please-end
authors.workspace = true
edition.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion acvm-repo/acvm_js/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "acvm_js"
description = "Typescript wrapper around the ACVM allowing execution of ACIR code"
# x-release-please-start-version
version = "1.0.0-beta.0"
version = "1.0.0-beta.1"
# x-release-please-end
authors.workspace = true
edition.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion acvm-repo/acvm_js/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@noir-lang/acvm_js",
"version": "1.0.0-beta.0",
"version": "1.0.0-beta.1",
"publishConfig": {
"access": "public"
},
Expand Down
2 changes: 1 addition & 1 deletion acvm-repo/blackbox_solver/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "acvm_blackbox_solver"
description = "A solver for the blackbox functions found in ACIR and Brillig"
# x-release-please-start-version
version = "1.0.0-beta.0"
version = "1.0.0-beta.1"
# x-release-please-end
authors.workspace = true
edition.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion acvm-repo/bn254_blackbox_solver/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "bn254_blackbox_solver"
description = "Solvers for black box functions which are specific for the bn254 curve"
# x-release-please-start-version
version = "1.0.0-beta.0"
version = "1.0.0-beta.1"
# x-release-please-end
authors.workspace = true
edition.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion acvm-repo/brillig/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "brillig"
description = "Brillig is the bytecode ACIR uses for non-determinism."
# x-release-please-start-version
version = "1.0.0-beta.0"
version = "1.0.0-beta.1"
# x-release-please-end
authors.workspace = true
edition.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion acvm-repo/brillig_vm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "brillig_vm"
description = "The virtual machine that processes Brillig bytecode, used to introduce non-determinism to the ACVM"
# x-release-please-start-version
version = "1.0.0-beta.0"
version = "1.0.0-beta.1"
# x-release-please-end
authors.workspace = true
edition.workspace = true
Expand Down
1 change: 1 addition & 0 deletions compiler/noirc_evaluator/src/acir/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ impl<'a> Context<'a> {
let result = dfg.instruction_results(instruction_id)[0];
self.ssa_values.insert(result, value);
}
Instruction::Noop => (),
}

self.acir_context.set_call_stack(CallStack::new());
Expand Down
Loading

0 comments on commit 3c5997d

Please sign in to comment.