Skip to content
This repository has been archived by the owner on Oct 31, 2023. It is now read-only.

feat!: Update to target ACVM 0.15.0 #217

Merged
merged 4 commits into from
Jun 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 10 additions & 10 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ license = "MIT OR Apache-2.0"
crate-type = ["cdylib", "lib"]

[dependencies]
acvm = { version = "0.14.0", features = ["bn254"] }
acvm = { version = "0.15.0", features = ["bn254"] }
bincode = "1.3.3"
bytesize = "1.2"
reqwest = { version = "0.11.16", default-features = false, features = ["rustls-tls"] }
Expand Down
12 changes: 6 additions & 6 deletions src/acvm_interop/pwg.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use acvm::acir::circuit::opcodes::FunctionInput;
use acvm::acir::native_types::{Witness, WitnessMap};
use acvm::acir::BlackBoxFunc;
use acvm::pwg::{witness_to_value, OpcodeResolution, OpcodeResolutionError};
use acvm::pwg::{insert_value, witness_to_value, OpcodeResolution, OpcodeResolutionError};
use acvm::{FieldElement, PartialWitnessGenerator};

use crate::pedersen::Pedersen;
Expand Down Expand Up @@ -94,7 +94,7 @@ impl PartialWitnessGenerator for Barretenberg {
dbg!("signature has failed to verify");
}

initial_witness.insert(*output, FieldElement::from(valid_signature));
insert_value(output, FieldElement::from(valid_signature), initial_witness)?;
Ok(OpcodeResolution::Solved)
}

Expand All @@ -114,8 +114,8 @@ impl PartialWitnessGenerator for Barretenberg {
let (res_x, res_y) = self.encrypt(scalars, domain_separator).map_err(|err| {
OpcodeResolutionError::BlackBoxFunctionFailed(BlackBoxFunc::Pedersen, err.to_string())
})?;
initial_witness.insert(outputs[0], res_x);
initial_witness.insert(outputs[1], res_y);
insert_value(&outputs[0], res_x, initial_witness)?;
insert_value(&outputs[1], res_y, initial_witness)?;
Ok(OpcodeResolution::Solved)
}

Expand All @@ -134,8 +134,8 @@ impl PartialWitnessGenerator for Barretenberg {
)
})?;

initial_witness.insert(outputs[0], pub_x);
initial_witness.insert(outputs[1], pub_y);
insert_value(&outputs[0], pub_x, initial_witness)?;
insert_value(&outputs[1], pub_y, initial_witness)?;
Ok(OpcodeResolution::Solved)
}
}