|
@@ -327,7 +327,7 @@ public:
|
|
|
// computations are complete, AXS should be subtracted from the
|
|
|
// accumulator A.
|
|
|
template<typename FieldT>
|
|
|
-class ec_constant_scalarmul_vec_gadget : public gadget<FieldT> {
|
|
|
+class ec_constant_scalarmul_vec_accum_gadget : public gadget<FieldT> {
|
|
|
private:
|
|
|
FieldT Cx, Cy;
|
|
|
pb_variable_array<FieldT> accumx, accumy;
|
|
@@ -343,7 +343,7 @@ public:
|
|
|
// C or (2^i * P) + C to the accumulator, and regardless of s, add C
|
|
|
// to the excess.
|
|
|
|
|
|
- ec_constant_scalarmul_vec_gadget(protoboard<FieldT> &pb,
|
|
|
+ ec_constant_scalarmul_vec_accum_gadget(protoboard<FieldT> &pb,
|
|
|
const pb_variable<FieldT> &outx,
|
|
|
const pb_variable<FieldT> &outy,
|
|
|
const pb_variable<FieldT> &Ax,
|
|
@@ -351,7 +351,7 @@ public:
|
|
|
const pb_variable_array<FieldT> &svec,
|
|
|
const FieldT &Px, const FieldT &Py,
|
|
|
FieldT &AXSx, FieldT &AXSy) :
|
|
|
- gadget<FieldT>(pb, "ec_constant_scalarmul_vec_gadget"),
|
|
|
+ gadget<FieldT>(pb, "ec_constant_scalarmul_vec_accum_gadget"),
|
|
|
// Precomputed coordinates of C
|
|
|
Cx(2),
|
|
|
Cy("4950745124018817972378217179409499695353526031437053848725554590521829916331"),
|
|
@@ -407,11 +407,11 @@ public:
|
|
|
// accumulator excess (AXS) will be updated; when all the computations
|
|
|
// are complete, AXS should be subtracted from the accumulator A.
|
|
|
template<typename FieldT>
|
|
|
-class ec_constant_scalarmul_gadget : public gadget<FieldT> {
|
|
|
+class ec_constant_scalarmul_accum_gadget : public gadget<FieldT> {
|
|
|
private:
|
|
|
pb_variable_array<FieldT> svec;
|
|
|
std::vector<packing_gadget<FieldT> > packers;
|
|
|
- std::vector<ec_constant_scalarmul_vec_gadget<FieldT> > vecgadget;
|
|
|
+ std::vector<ec_constant_scalarmul_vec_accum_gadget<FieldT> > vecgadget;
|
|
|
|
|
|
public:
|
|
|
const pb_variable<FieldT> outx, outy;
|
|
@@ -419,7 +419,7 @@ public:
|
|
|
const pb_variable<FieldT> s;
|
|
|
const FieldT Px, Py;
|
|
|
|
|
|
- ec_constant_scalarmul_gadget(protoboard<FieldT> &pb,
|
|
|
+ ec_constant_scalarmul_accum_gadget(protoboard<FieldT> &pb,
|
|
|
const pb_variable<FieldT> &outx,
|
|
|
const pb_variable<FieldT> &outy,
|
|
|
const pb_variable<FieldT> &Ax,
|
|
@@ -427,7 +427,7 @@ public:
|
|
|
const pb_variable<FieldT> &s,
|
|
|
const FieldT &Px, const FieldT &Py,
|
|
|
FieldT &AXSx, FieldT &AXSy) :
|
|
|
- gadget<FieldT>(pb, "ec_constant_scalarmul_gadget"),
|
|
|
+ gadget<FieldT>(pb, "ec_constant_scalarmul_accum_gadget"),
|
|
|
outx(outx), outy(outy), Ax(Ax), Ay(Ay), s(s), Px(Px), Py(Py)
|
|
|
{
|
|
|
// Allocate variables to protoboard
|
|
@@ -457,7 +457,7 @@ template<typename FieldT>
|
|
|
class ec_pedersen_gadget : public gadget<FieldT> {
|
|
|
private:
|
|
|
pb_variable<FieldT> accinx, acciny, accmidx, accmidy, accoutx, accouty;
|
|
|
- std::vector<ec_constant_scalarmul_gadget<FieldT> > mulgadgets;
|
|
|
+ std::vector<ec_constant_scalarmul_accum_gadget<FieldT> > mulgadgets;
|
|
|
std::vector<ec_constant_add_gadget<FieldT> > addgadget;
|
|
|
const FieldT Gx, Gy, Hx, Hy, Ax, Ay;
|
|
|
|