Skip to content

Commit

Permalink
Disable default constructor of plonk variable
Browse files Browse the repository at this point in the history
  • Loading branch information
akokoshn committed Apr 12, 2024
1 parent f80fbaf commit da7bdd2
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 59 deletions.
68 changes: 25 additions & 43 deletions include/nil/crypto3/zk/snark/arithmetization/plonk/copy_constraint.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,67 +38,49 @@ namespace nil {

template<typename FieldType>
struct plonk_copy_constraint {
plonk_copy_constraint() = default;
plonk_copy_constraint(const plonk_copy_constraint<FieldType> &other){
initialize(other.first, other.second);
plonk_copy_constraint() = delete;
plonk_copy_constraint(const plonk_copy_constraint<FieldType> &other): first(other.first), second(other.second) {
initialize();
}
plonk_copy_constraint(
const plonk_variable<typename FieldType::value_type> &_first,
const plonk_variable<typename FieldType::value_type> &_second
){
initialize(_first, _second);
): first(_first), second(_second) {
initialize();
}

plonk_variable<typename FieldType::value_type> first;
plonk_variable<typename FieldType::value_type> second;
bool operator==(const plonk_copy_constraint<FieldType> &other){
return ((first == other.first ) && (second == other.second));
}
protected:
void initialize(
const plonk_variable<typename FieldType::value_type> &_first,
const plonk_variable<typename FieldType::value_type> &_second
){
BOOST_ASSERT(_first.relative == false);
BOOST_ASSERT(_second.relative == false);
if(_first.type == _second.type){
if(_first.index < _second.index){
first = plonk_variable<typename FieldType::value_type>(_first);
second = plonk_variable<typename FieldType::value_type>(_second);
} else if (_first.index > _second.index){
first = plonk_variable<typename FieldType::value_type>(_second);
second = plonk_variable<typename FieldType::value_type>(_first);
} else if (_first.rotation < _second.rotation){
first = plonk_variable<typename FieldType::value_type>(_first);
second = plonk_variable<typename FieldType::value_type>(_second);
} else if (_first.rotation > _second.rotation){
first = plonk_variable<typename FieldType::value_type>(_second);
second = plonk_variable<typename FieldType::value_type>(_first);
} else {
void initialize() {
BOOST_ASSERT(first.relative == false);
BOOST_ASSERT(second.relative == false);
if(first.type == second.type){
if(first.index > second.index || (first.index == second.index && first.rotation > second.rotation)){
swap();
} else if (first.index == second.index && first.rotation == second.rotation){
BOOST_ASSERT_MSG(false, "Copy constraint with equal variables");
}
return;
}
if( _first.type == plonk_variable<typename FieldType::value_type>::column_type::witness){
first = plonk_variable<typename FieldType::value_type>(_first);
second = plonk_variable<typename FieldType::value_type>(_second);
} else if (
_first.type == plonk_variable<typename FieldType::value_type>::column_type::public_input &&
_second.type != plonk_variable<typename FieldType::value_type>::column_type::witness
){
first = plonk_variable<typename FieldType::value_type>(_first);
second = plonk_variable<typename FieldType::value_type>(_second);
} else if(
_first.type == plonk_variable<typename FieldType::value_type>::column_type::constant &&
_second.type == plonk_variable<typename FieldType::value_type>::column_type::selector
){
first = plonk_variable<typename FieldType::value_type>(_first);
second = plonk_variable<typename FieldType::value_type>(_second);
} else {
first = plonk_variable<typename FieldType::value_type>(_second);
second = plonk_variable<typename FieldType::value_type>(_first);
if(first.type != plonk_variable<typename FieldType::value_type>::column_type::witness &&
(first.type != plonk_variable<typename FieldType::value_type>::column_type::public_input ||
second.type == plonk_variable<typename FieldType::value_type>::column_type::witness) &&
(first.type != plonk_variable<typename FieldType::value_type>::column_type::constant ||
second.type != plonk_variable<typename FieldType::value_type>::column_type::selector)){
swap();
}
return;
}

void swap() {
const auto tmp = first;
first = second;
second = tmp;
}
};

template <typename FieldType>
Expand Down
4 changes: 0 additions & 4 deletions include/nil/crypto3/zk/snark/arithmetization/plonk/table_description.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,6 @@ namespace nil {
return witness_columns + public_input_columns + a.index;
case plonk_variable<typename FieldType::value_type>::column_type::selector:
return witness_columns + public_input_columns + constant_columns + a.index;
case plonk_variable<typename FieldType::value_type>::column_type::uninitialized:
std::cerr << "trying to access uninitialized var!";
std::abort();
break;
}
/* unreachable*/
return std::numeric_limits<size_t>::max();
Expand Down
11 changes: 7 additions & 4 deletions include/nil/crypto3/zk/snark/arithmetization/plonk/variable.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ namespace nil {
using assignment_type = AssignmentType;

enum column_type : std::uint8_t {
witness, public_input, constant, selector, uninitialized
witness, public_input, constant, selector
};

/**
Expand All @@ -80,7 +80,11 @@ namespace nil {
bool relative;
column_type type;

constexpr plonk_variable() : index(0), rotation(0), relative(false), type(column_type::uninitialized) {};
constexpr plonk_variable() = delete;

constexpr plonk_variable(const plonk_variable &other) :
index(other.index),
rotation(other.rotation), relative(other.relative), type(other.type) {};

constexpr plonk_variable(const std::size_t index,
std::int32_t rotation,
Expand Down Expand Up @@ -172,8 +176,7 @@ namespace nil {
{plonk_variable<AssignmentType>::column_type::witness, "w"},
{plonk_variable<AssignmentType>::column_type::public_input, "pub"},
{plonk_variable<AssignmentType>::column_type::constant, "c"},
{plonk_variable<AssignmentType>::column_type::selector, "sel"},
{plonk_variable<AssignmentType>::column_type::uninitialized,"NaN"}
{plonk_variable<AssignmentType>::column_type::selector, "sel"}
};
os << type_map[var.type] << "_" << var.index;
if (!var.relative) {
Expand Down
4 changes: 0 additions & 4 deletions include/nil/crypto3/zk/snark/systems/plonk/placeholder/gates_argument.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,6 @@ namespace nil {
case polynomial_dfs_variable_type::column_type::selector:
assignment = assignments.selector(var.index);
break;
case polynomial_dfs_variable_type::column_type::uninitialized:
std::cerr << "trying to access uninitialized var!";
std::abort();
break;
}

if (var.rotation != 0) {
Expand Down
4 changes: 0 additions & 4 deletions include/nil/crypto3/zk/snark/systems/plonk/placeholder/lookup_argument.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -462,10 +462,6 @@ namespace nil {
case DfsVariableType::column_type::selector:
assignment = assignments.selector(var.index);
break;
case DfsVariableType::column_type::uninitialized:
std::cerr << "trying to access uninitialized var!";
std::abort();
break;
}

if (var.rotation != 0) {
Expand Down

0 comments on commit da7bdd2

Please sign in to comment.