Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: update to ACVM 0.15.0 #1616

Merged
merged 4 commits into from
Jun 16, 2023
Merged

feat: update to ACVM 0.15.0 #1616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1005556
chore: update to new ACVM interface
TomAFrench Jun 9, 2023
92a47e6
chore: bump to acvm master
TomAFrench Jun 14, 2023
34c3f2a
Merge branch 'master' into restricted-pwg
TomAFrench Jun 15, 2023
0543a30
chore: bump to crates.io release of `acvm-backend-barretenberg`
TomAFrench Jun 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions Cargo.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ edition = "2021"
rust-version = "1.66"

[workspace.dependencies]
acvm = "=0.14.4"
acvm = "0.15.0"
arena = { path = "crates/arena" }
fm = { path = "crates/fm" }
iter-extended = { path = "crates/iter-extended" }
Expand Down Expand Up @@ -52,4 +52,4 @@ toml = "0.7.2"
tower = "0.4"
url = "2.2.0"
wasm-bindgen = { version = "0.2.83", features = ["serde-serialize"] }
wasm-bindgen-test = "0.3.33"
wasm-bindgen-test = "0.3.33"
4 changes: 2 additions & 2 deletions crates/nargo/src/ops/execute.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use acvm::pwg::{solve, PartialWitnessGeneratorStatus};
use acvm::pwg::{solve, Blocks, PartialWitnessGeneratorStatus};
use acvm::PartialWitnessGenerator;
use acvm::{acir::circuit::Circuit, acir::native_types::WitnessMap, pwg::block::Blocks};
use acvm::{acir::circuit::Circuit, acir::native_types::WitnessMap};

use crate::NargoError;

Expand Down
2 changes: 1 addition & 1 deletion crates/nargo_cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ color-eyre = "0.6.2"
tokio = "1.0"

# Backends
acvm-backend-barretenberg = { version = "0.4.0", default-features = false }
acvm-backend-barretenberg = { version = "0.5.0", default-features = false }

[dev-dependencies]
tempdir = "0.3.7"
Expand Down
2 changes: 1 addition & 1 deletion crates/noirc_evaluator/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pub mod brillig;
use acvm::{
acir::circuit::{opcodes::Opcode as AcirOpcode, Circuit, PublicInputs},
acir::native_types::{Expression, Witness},
compiler::optimizers::simplify::CircuitSimplifier,
compiler::CircuitSimplifier,
Language,
};
use errors::{RuntimeError, RuntimeErrorKind};
Expand Down
3 changes: 1 addition & 2 deletions crates/noirc_evaluator/src/ssa/acir_gen/operations/sort.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,7 @@ mod test {
use acvm::{
acir::{circuit::opcodes::FunctionInput, native_types::Witness, native_types::WitnessMap},
pwg::{
block::Blocks, solve, OpcodeResolution, OpcodeResolutionError,
PartialWitnessGeneratorStatus,
solve, Blocks, OpcodeResolution, OpcodeResolutionError, PartialWitnessGeneratorStatus,
},
FieldElement, PartialWitnessGenerator,
};
Expand Down
2 changes: 1 addition & 1 deletion crates/noirc_evaluator/src/ssa_refactor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ pub fn experimental_create_circuit(
// unoptimized backend-agnostic bytecode here
let optimized_circuit = {
use crate::errors::RuntimeErrorKind;
use acvm::compiler::optimizers::simplify::CircuitSimplifier;
use acvm::compiler::CircuitSimplifier;

let abi_len = abi.field_count();

Expand Down