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.

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

fix slice assignment for strings #1027

Merged
merged 7 commits into from
Jun 11, 2021
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
622 changes: 243 additions & 379 deletions Cargo.lock

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -70,22 +70,22 @@ path = "./synthesizer"
version = "1.5.0"

[dependencies.snarkvm-algorithms]
version = "0.3.1"
version = "0.5.4"

[dependencies.snarkvm-curves]
version = "0.3.1"
version = "0.5.4"
default-features = false

[dependencies.snarkvm-gadgets]
version = "0.3.1"
version = "0.5.4"
default-features = false

[dependencies.snarkvm-r1cs]
version = "0.3.1"
version = "0.5.4"
default-features = false

[dependencies.snarkvm-utilities]
version = "0.3.1"
version = "0.5.4"

[dependencies.anyhow]
version = "1.0"
Expand Down
6 changes: 6 additions & 0 deletions ast/src/reducer/canonicalization.rs
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,12 @@ impl ReconstructingReducer for Canonicalizer {
span: assign.span.clone(),
})
}
Expression::ArrayInline(_) => Ok(AssignStatement {
operation: AssignOperation::Assign,
assignee,
value,
span: assign.span.clone(),
}),
_ => Ok(assign.clone()),
}
}
Expand Down
14 changes: 7 additions & 7 deletions compiler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,27 +57,27 @@ version = "1.5.0"
version = "0.4"

[dependencies.snarkvm-curves]
version = "0.3.1"
version = "0.5.4"
default-features = false

[dependencies.snarkvm-fields]
version = "0.3.1"
version = "0.5.4"
default-features = false

[dependencies.snarkvm-dpc]
version = "0.3.1"
version = "0.5.4"
default-features = false

[dependencies.snarkvm-gadgets]
version = "0.3.1"
version = "0.5.4"
default-features = false

[dependencies.snarkvm-r1cs]
version = "0.3.1"
version = "0.5.4"
default-features = false

[dependencies.snarkvm-utilities]
version = "0.3.1"
version = "0.5.4"

[dependencies.bincode]
version = "1.3"
Expand Down Expand Up @@ -118,7 +118,7 @@ version = "0.3"
default-features = false

[dev-dependencies.snarkvm-algorithms]
version = "0.3.1"
version = "0.5.4"
default-features = false

[dev-dependencies.tempfile]
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/compiler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ use leo_package::inputs::InputPairs;
use leo_parser::parse_ast;
use leo_state::verify_local_data_commitment;

use snarkvm_dpc::{base_dpc::instantiated::Components, SystemParameters};
use snarkvm_dpc::testnet1::{instantiated::Components, parameters::SystemParameters};
use snarkvm_fields::PrimeField;
use snarkvm_r1cs::{ConstraintSynthesizer, ConstraintSystem, SynthesisError};

Expand Down
2 changes: 1 addition & 1 deletion compiler/src/console/assert.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ use crate::{
use leo_asg::{Expression, Span};

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::traits::utilities::boolean::Boolean;
use snarkvm_gadgets::boolean::Boolean;
use snarkvm_r1cs::ConstraintSystem;

impl<'a, F: PrimeField, G: GroupType<F>> ConstrainedProgram<'a, F, G> {
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/console/console.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use crate::{errors::ConsoleError, program::ConstrainedProgram, statement::get_in
use leo_asg::{ConsoleFunction, ConsoleStatement};

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::traits::utilities::boolean::Boolean;
use snarkvm_gadgets::boolean::Boolean;
use snarkvm_r1cs::ConstraintSystem;

impl<'a, F: PrimeField, G: GroupType<F>> ConstrainedProgram<'a, F, G> {
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/expression/array/access.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use crate::{
use leo_asg::{ConstInt, Expression, Span};

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::utilities::{
use snarkvm_gadgets::{
boolean::Boolean,
eq::{EqGadget, EvaluateEqGadget},
select::CondSelectGadget,
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/expression/conditional/conditional.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use crate::{errors::ExpressionError, program::ConstrainedProgram, value::Constra
use leo_asg::{Expression, Span};

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::traits::utilities::select::CondSelectGadget;
use snarkvm_gadgets::traits::select::CondSelectGadget;
use snarkvm_r1cs::ConstraintSystem;

impl<'a, F: PrimeField, G: GroupType<F>> ConstrainedProgram<'a, F, G> {
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/expression/expression.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ use crate::{
use leo_asg::{expression::*, ConstValue, Expression, Node, Span};

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::traits::utilities::boolean::Boolean;
use snarkvm_gadgets::boolean::Boolean;
use snarkvm_r1cs::ConstraintSystem;

impl<'a, F: PrimeField, G: GroupType<F>> ConstrainedProgram<'a, F, G> {
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/expression/logical/and.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use crate::{errors::BooleanError, value::ConstrainedValue, GroupType};
use leo_asg::Span;

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::traits::utilities::boolean::Boolean;
use snarkvm_gadgets::boolean::Boolean;
use snarkvm_r1cs::ConstraintSystem;

pub fn enforce_and<'a, F: PrimeField, G: GroupType<F>, CS: ConstraintSystem<F>>(
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/expression/logical/or.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use crate::{errors::BooleanError, value::ConstrainedValue, GroupType};
use leo_asg::Span;

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::traits::utilities::boolean::Boolean;
use snarkvm_gadgets::boolean::Boolean;
use snarkvm_r1cs::ConstraintSystem;

pub fn enforce_or<'a, F: PrimeField, G: GroupType<F>, CS: ConstraintSystem<F>>(
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/expression/relational/eq.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use crate::{enforce_and, errors::ExpressionError, value::ConstrainedValue, Group
use leo_asg::Span;

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::traits::utilities::{boolean::Boolean, eq::EvaluateEqGadget};
use snarkvm_gadgets::{boolean::Boolean, eq::EvaluateEqGadget};
use snarkvm_r1cs::ConstraintSystem;

pub fn evaluate_eq<'a, F: PrimeField, G: GroupType<F>, CS: ConstraintSystem<F>>(
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/expression/relational/ge.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType};
use leo_asg::Span;

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::utilities::bits::ComparatorGadget;
use snarkvm_gadgets::traits::bits::ComparatorGadget;
use snarkvm_r1cs::ConstraintSystem;

pub fn evaluate_ge<'a, F: PrimeField, G: GroupType<F>, CS: ConstraintSystem<F>>(
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/expression/relational/gt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType};
use leo_asg::Span;

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::utilities::bits::ComparatorGadget;
use snarkvm_gadgets::traits::bits::ComparatorGadget;
use snarkvm_r1cs::ConstraintSystem;

pub fn evaluate_gt<'a, F: PrimeField, G: GroupType<F>, CS: ConstraintSystem<F>>(
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/expression/relational/le.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType};
use leo_asg::Span;

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::utilities::bits::ComparatorGadget;
use snarkvm_gadgets::traits::bits::ComparatorGadget;
use snarkvm_r1cs::ConstraintSystem;

pub fn evaluate_le<'a, F: PrimeField, G: GroupType<F>, CS: ConstraintSystem<F>>(
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/expression/relational/lt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType};
use leo_asg::Span;

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::utilities::bits::EvaluateLtGadget;
use snarkvm_gadgets::traits::bits::EvaluateLtGadget;
use snarkvm_r1cs::ConstraintSystem;

pub fn evaluate_lt<'a, F: PrimeField, G: GroupType<F>, CS: ConstraintSystem<F>>(
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/function/function.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use leo_asg::{Expression, Function, FunctionQualifier};
use std::cell::Cell;

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::traits::utilities::boolean::Boolean;
use snarkvm_gadgets::boolean::Boolean;
use snarkvm_r1cs::ConstraintSystem;

impl<'a, F: PrimeField, G: GroupType<F>> ConstrainedProgram<'a, F, G> {
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/function/input/main_function_input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ use leo_asg::{ConstInt, Type};
use leo_ast::{InputValue, Span};

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::traits::utilities::boolean::Boolean;
use snarkvm_gadgets::boolean::Boolean;
use snarkvm_r1cs::ConstraintSystem;

impl<'a, F: PrimeField, G: GroupType<F>> ConstrainedProgram<'a, F, G> {
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/function/mut_target.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ use leo_asg::{
};

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::utilities::boolean::Boolean;
use snarkvm_gadgets::boolean::Boolean;
use snarkvm_r1cs::ConstraintSystem;

impl<'a, F: PrimeField, G: GroupType<F>> ConstrainedProgram<'a, F, G> {
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/function/result/result.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use crate::{
use leo_asg::{Span, Type};

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::traits::utilities::{boolean::Boolean, select::CondSelectGadget};
use snarkvm_gadgets::{boolean::Boolean, select::CondSelectGadget};
use snarkvm_r1cs::ConstraintSystem;

impl<'a, F: PrimeField, G: GroupType<F>> ConstrainedProgram<'a, F, G> {
Expand Down
8 changes: 4 additions & 4 deletions compiler/src/prelude/blake2s.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
use super::CoreCircuit;
use crate::{errors::ExpressionError, ConstrainedValue, GroupType, Integer};
use leo_asg::{Function, Span};

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::{
algorithms::prf::Blake2sGadget,
traits::{
algorithms::PRFGadget,
utilities::{uint::UInt8, ToBytesGadget},
},
bits::ToBytesGadget,
integers::uint::UInt8,
traits::algorithms::PRFGadget,
};
use snarkvm_r1cs::ConstraintSystem;

Expand Down
2 changes: 1 addition & 1 deletion compiler/src/statement/assign/assign.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use crate::{arithmetic::*, errors::StatementError, program::ConstrainedProgram,
use leo_asg::{AssignOperation, AssignStatement, Span};

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::traits::utilities::{boolean::Boolean, select::CondSelectGadget};
use snarkvm_gadgets::{boolean::Boolean, traits::select::CondSelectGadget};
use snarkvm_r1cs::ConstraintSystem;

impl<'a, F: PrimeField, G: GroupType<F>> ConstrainedProgram<'a, F, G> {
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/statement/assign/assignee/array_index.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ use crate::{
use leo_asg::{ConstInt, Expression, Node};

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::utilities::{eq::EvaluateEqGadget, select::CondSelectGadget};
use snarkvm_gadgets::{eq::EvaluateEqGadget, select::CondSelectGadget};
use snarkvm_r1cs::ConstraintSystem;

use super::ResolverContext;
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/statement/assign/assignee/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use crate::{errors::StatementError, program::ConstrainedProgram, value::Constrai
use leo_asg::{AssignAccess, AssignOperation, AssignStatement, Span};

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::utilities::boolean::Boolean;
use snarkvm_gadgets::boolean::Boolean;
use snarkvm_r1cs::ConstraintSystem;

mod array_index;
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/statement/block/block.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use crate::{program::ConstrainedProgram, GroupType, IndicatorAndConstrainedValue
use leo_asg::BlockStatement;

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::traits::utilities::boolean::Boolean;
use snarkvm_gadgets::boolean::Boolean;
use snarkvm_r1cs::ConstraintSystem;

impl<'a, F: PrimeField, G: GroupType<F>> ConstrainedProgram<'a, F, G> {
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/statement/conditional/conditional.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use crate::{
use leo_asg::ConditionalStatement;

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::traits::utilities::boolean::Boolean;
use snarkvm_gadgets::boolean::Boolean;
use snarkvm_r1cs::ConstraintSystem;

fn indicator_to_string(indicator: &Boolean) -> String {
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/statement/iteration/iteration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use crate::{
use leo_asg::IterationStatement;

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::traits::utilities::{boolean::Boolean, uint::UInt32};
use snarkvm_gadgets::{boolean::Boolean, integers::uint::UInt32};
use snarkvm_r1cs::ConstraintSystem;

impl<'a, F: PrimeField, G: GroupType<F>> ConstrainedProgram<'a, F, G> {
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/statement/statement.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use crate::{errors::StatementError, program::ConstrainedProgram, value::Constrai
use leo_asg::{Node, Statement};

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::traits::utilities::boolean::Boolean;
use snarkvm_gadgets::boolean::Boolean;
use snarkvm_r1cs::ConstraintSystem;

pub type StatementResult<T> = Result<T, StatementError>;
Expand Down
14 changes: 8 additions & 6 deletions compiler/src/value/address/address.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,16 @@
use crate::{errors::AddressError, ConstrainedValue, GroupType, IntegerTrait};
use leo_ast::{InputValue, Span};

use snarkvm_dpc::{account::AccountAddress, base_dpc::instantiated::Components};
use snarkvm_dpc::{account::AccountAddress, testnet1::instantiated::Components};
use snarkvm_fields::PrimeField;
use snarkvm_gadgets::traits::utilities::{
alloc::AllocGadget,
use snarkvm_gadgets::{
boolean::Boolean,
eq::{ConditionalEqGadget, EqGadget, EvaluateEqGadget},
select::CondSelectGadget,
uint::UInt8,
integers::uint::UInt8,
traits::{
alloc::AllocGadget,
eq::{ConditionalEqGadget, EqGadget, EvaluateEqGadget},
select::CondSelectGadget,
},
};
use snarkvm_r1cs::{Assignment, ConstraintSystem, SynthesisError};
use snarkvm_utilities::ToBytes;
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/value/boolean/input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use crate::{errors::BooleanError, value::ConstrainedValue, GroupType};
use leo_ast::{InputValue, Span};

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::traits::utilities::{alloc::AllocGadget, boolean::Boolean};
use snarkvm_gadgets::{boolean::Boolean, traits::alloc::AllocGadget};
use snarkvm_r1cs::{ConstraintSystem, SynthesisError};

pub(crate) fn allocate_bool<F: PrimeField, CS: ConstraintSystem<F>>(
Expand Down
4 changes: 2 additions & 2 deletions compiler/src/value/char/char.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ use crate::{

use leo_ast::{InputValue, Span};
use snarkvm_fields::PrimeField;
use snarkvm_gadgets::utilities::{
bits::comparator::{ComparatorGadget, EvaluateLtGadget},
use snarkvm_gadgets::{
boolean::Boolean,
eq::{ConditionalEqGadget, EqGadget, EvaluateEqGadget, NEqGadget},
select::CondSelectGadget,
traits::bits::comparator::{ComparatorGadget, EvaluateLtGadget},
};
use snarkvm_r1cs::{ConstraintSystem, SynthesisError};

Expand Down
17 changes: 7 additions & 10 deletions compiler/src/value/field/field_type.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,16 @@ use leo_ast::Span;

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::{
bits::{ToBitsBEGadget, ToBytesGadget},
boolean::Boolean,
fields::FpGadget,
integers::uint::UInt8,
traits::{
alloc::AllocGadget,
bits::comparator::{ComparatorGadget, EvaluateLtGadget},
eq::{ConditionalEqGadget, EqGadget, EvaluateEqGadget, NEqGadget},
fields::FieldGadget,
utilities::{
alloc::AllocGadget,
bits::comparator::{ComparatorGadget, EvaluateLtGadget},
boolean::Boolean,
eq::{ConditionalEqGadget, EqGadget, EvaluateEqGadget, NEqGadget},
select::CondSelectGadget,
uint::UInt8,
ToBitsBEGadget,
ToBytesGadget,
},
select::CondSelectGadget,
},
};
use snarkvm_r1cs::{ConstraintSystem, SynthesisError};
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/value/field/input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use crate::{errors::FieldError, number_string_typing, value::ConstrainedValue, F
use leo_ast::{InputValue, Span};

use snarkvm_fields::PrimeField;
use snarkvm_gadgets::traits::utilities::alloc::AllocGadget;
use snarkvm_gadgets::traits::alloc::AllocGadget;
use snarkvm_r1cs::{ConstraintSystem, SynthesisError};

pub(crate) fn allocate_field<F: PrimeField, CS: ConstraintSystem<F>>(
Expand Down
Loading