Prover optimizations (#34)

* Changes for mcl support

* Extra info printing

* Added server mode + misc optimizations

Author: Brechtpd

Circuits/Circuit.h

@@ -0,0 +1,31 @@
+#ifndef _CIRCUIT_H_
+#define _CIRCUIT_H_
+
+#include "ethsnarks.hpp"
+#include "../Utils/Data.h"
+
+using namespace ethsnarks;
+
+namespace Loopring
+{
+
+class Circuit : public GadgetT
+{
+public:
+    Circuit(libsnark::protoboard<FieldT> &pb, const std::string &annotation_prefix) : GadgetT(pb, annotation_prefix) {};
+    virtual ~Circuit() {};
+    virtual void generateConstraints(bool onchainDataAvailability, unsigned int blockSize) = 0;
+    virtual bool generateWitness(const json& input) = 0;
+    virtual BlockType getBlockType() = 0;
+    virtual unsigned int getBlockSize() = 0;
+    virtual void printInfo() = 0;
+
+    libsnark::protoboard<FieldT>& getPb()
+    {
+        return pb;
+    }
+};
+
+}
+
+#endif

Circuits/DepositCircuit.h

@@ -1,6 +1,7 @@
 #ifndef _DEPOSITCIRCUIT_H_
 #define _DEPOSITCIRCUIT_H_
 
+#include "Circuit.h"
 #include "../Utils/Constants.h"
 #include "../Utils/Data.h"
 
@@ -130,7 +131,7 @@ class DepositGadget : public GadgetT
     }
 };
 
-class DepositCircuit : public GadgetT
+class DepositCircuit : public Circuit
 {
 public:
 
@@ -151,7 +152,7 @@ class DepositCircuit : public GadgetT
     std::vector<sha256_many> hashers;
 
     DepositCircuit(ProtoboardT& pb, const std::string& prefix) :
-        GadgetT(pb, prefix),
+        Circuit(pb, prefix),
 
         publicData(pb, FMT(prefix, ".publicData")),
         constants(pb, FMT(prefix, ".constants")),
@@ -167,9 +168,9 @@ class DepositCircuit : public GadgetT
 
     }
 
-    void generate_r1cs_constraints(int numDeposits)
+    void generateConstraints(bool onchainDataAvailability, unsigned int blockSize) override
     {
-        this->numDeposits = numDeposits;
+        this->numDeposits = blockSize;
 
         constants.generate_r1cs_constraints();
 
@@ -231,9 +232,16 @@ class DepositCircuit : public GadgetT
 
         // Deposits
         assert(deposits.size() == hashers.size());
+#ifdef MULTICORE
+        #pragma omp parallel for
+#endif
         for(unsigned int i = 0; i < block.deposits.size(); i++)
         {
             deposits[i].generate_r1cs_witness(block.deposits[i]);
+        }
+        // Cannot be done in parallel
+        for(unsigned int i = 0; i < block.deposits.size(); i++)
+        {
             hashers[i].generate_r1cs_witness();
         }
         // printBits("DepositBlockHash: 0x", hashers.back().result().bits.get_bits(pb));
@@ -244,7 +252,22 @@ class DepositCircuit : public GadgetT
         return true;
     }
 
-    void printInfo()
+    bool generateWitness(const json& input) override
+    {
+        return generateWitness(input.get<Loopring::DepositBlock>());
+    }
+
+    BlockType getBlockType() override
+    {
+        return BlockType::Deposit;
+    }
+
+    unsigned int getBlockSize() override
+    {
+        return numDeposits;
+    }
+
+    void printInfo() override
     {
         std::cout << pb.num_constraints() << " constraints (" << (pb.num_constraints() / numDeposits) << "/deposit)" << std::endl;
     }

Circuits/InternalTransferCircuit.h

@@ -1,6 +1,7 @@
 #ifndef _INTERNAL_TRANSFER_CIRCUIT_H_
 #define _INTERNAL_TRANSFER_CIRCUIT_H_
 
+#include "Circuit.h"
 #include "../Utils/Constants.h"
 #include "../Utils/Data.h"
 #include "../Utils/Utils.h"
@@ -280,7 +281,7 @@ class InternalTransferGadget : public GadgetT
     }
 };
 
-class InternalTransferCircuit : public GadgetT
+class InternalTransferCircuit : public Circuit
 {
 public:
     PublicDataGadget publicData;
@@ -312,7 +313,7 @@ class InternalTransferCircuit : public GadgetT
     std::unique_ptr<LabelHasher> labelHasher;
 
     InternalTransferCircuit(ProtoboardT &pb, const std::string &prefix)
-        : GadgetT(pb, prefix),
+        : Circuit(pb, prefix),
 
           publicData(pb, FMT(prefix, ".publicData")),
           constants(pb, FMT(prefix, ".constants")),
@@ -331,10 +332,10 @@ class InternalTransferCircuit : public GadgetT
     {
     }
 
-    void generate_r1cs_constraints(bool onchainDataAvailability, int numTransfers)
+    void generateConstraints(bool onchainDataAvailability, unsigned int blockSize) override
     {
         this->onchainDataAvailability = onchainDataAvailability;
-        this->numTransfers = numTransfers;
+        this->numTransfers = blockSize;
 
         constants.generate_r1cs_constraints();
 
@@ -413,6 +414,9 @@ class InternalTransferCircuit : public GadgetT
         publicKeyX_notZero.generate_r1cs_witness();
 
         // Internal transfers
+#ifdef MULTICORE
+        #pragma omp parallel for
+#endif
         for (unsigned int i = 0; i < block.transfers.size(); i++)
         {
             transfers[i].generate_r1cs_witness(block.transfers[i]);
@@ -430,7 +434,22 @@ class InternalTransferCircuit : public GadgetT
         return true;
     }
 
-    void printInfo()
+    bool generateWitness(const json& input) override
+    {
+        return generateWitness(input.get<Loopring::InternalTransferBlock>());
+    }
+
+    BlockType getBlockType() override
+    {
+        return BlockType::InternalTransfer;
+    }
+
+    unsigned int getBlockSize() override
+    {
+        return numTransfers;
+    }
+
+    void printInfo() override
     {
         std::cout << pb.num_constraints() << " constraints (" << (pb.num_constraints() / numTransfers) << "/transfer)" << std::endl;
     }

Circuits/OffchainWithdrawalCircuit.h

@@ -1,6 +1,7 @@
 #ifndef _OFFCHAINWITHDRAWALCIRCUIT_H_
 #define _OFFCHAINWITHDRAWALCIRCUIT_H_
 
+#include "Circuit.h"
 #include "../Utils/Constants.h"
 #include "../Utils/Data.h"
 #include "../Utils/Utils.h"
@@ -257,7 +258,7 @@ class OffchainWithdrawalGadget : public GadgetT
     }
 };
 
-class OffchainWithdrawalCircuit : public GadgetT
+class OffchainWithdrawalCircuit : public Circuit
 {
 public:
 
@@ -290,7 +291,7 @@ class OffchainWithdrawalCircuit : public GadgetT
     std::unique_ptr<LabelHasher> labelHasher;
 
     OffchainWithdrawalCircuit(ProtoboardT& pb, const std::string& prefix) :
-        GadgetT(pb, prefix),
+        Circuit(pb, prefix),
 
         publicData(pb, FMT(prefix, ".publicData")),
         constants(pb, FMT(prefix, ".constants")),
@@ -310,10 +311,10 @@ class OffchainWithdrawalCircuit : public GadgetT
 
     }
 
-    void generate_r1cs_constraints(bool onchainDataAvailability, int numWithdrawals)
+    void generateConstraints(bool onchainDataAvailability, unsigned int blockSize) override
     {
         this->onchainDataAvailability = onchainDataAvailability;
-        this->numWithdrawals = numWithdrawals;
+        this->numWithdrawals = blockSize;
 
         constants.generate_r1cs_constraints();
 
@@ -398,6 +399,9 @@ class OffchainWithdrawalCircuit : public GadgetT
         publicKeyX_notZero.generate_r1cs_witness();
 
         // Withdrawals
+#ifdef MULTICORE
+        #pragma omp parallel for
+#endif
         for(unsigned int i = 0; i < block.withdrawals.size(); i++)
         {
             withdrawals[i].generate_r1cs_witness(block.withdrawals[i]);
@@ -415,7 +419,22 @@ class OffchainWithdrawalCircuit : public GadgetT
         return true;
     }
 
-    void printInfo()
+    bool generateWitness(const json& input) override
+    {
+        return generateWitness(input.get<Loopring::OffchainWithdrawalBlock>());
+    }
+
+    BlockType getBlockType() override
+    {
+        return BlockType::OffchainWithdrawal;
+    }
+
+    unsigned int getBlockSize() override
+    {
+        return numWithdrawals;
+    }
+
+    void printInfo() override
     {
         std::cout << pb.num_constraints() << " constraints (" << (pb.num_constraints() / numWithdrawals) << "/offchain withdrawal)" << std::endl;
     }

Circuits/OnchainWithdrawalCircuit.h

@@ -1,6 +1,7 @@
 #ifndef _ONCHAINWITHDRAWALCIRCUIT_H_
 #define _ONCHAINWITHDRAWALCIRCUIT_H_
 
+#include "Circuit.h"
 #include "../Utils/Constants.h"
 #include "../Utils/Data.h"
 #include "../Utils/Utils.h"
@@ -180,7 +181,7 @@ class OnchainWithdrawalGadget : public GadgetT
     }
 };
 
-class OnchainWithdrawalCircuit : public GadgetT
+class OnchainWithdrawalCircuit : public Circuit
 {
 public:
 
@@ -204,7 +205,7 @@ class OnchainWithdrawalCircuit : public GadgetT
     std::vector<sha256_many> hashers;
 
     OnchainWithdrawalCircuit(ProtoboardT& pb, const std::string& prefix) :
-        GadgetT(pb, prefix),
+        Circuit(pb, prefix),
 
         publicData(pb, FMT(prefix, ".publicData")),
         constants(pb, FMT(prefix, ".constants")),
@@ -223,9 +224,9 @@ class OnchainWithdrawalCircuit : public GadgetT
 
     }
 
-    void generate_r1cs_constraints(int numWithdrawals)
+    void generateConstraints(bool onchainDataAvailability, unsigned int blockSize) override
     {
-        this->numWithdrawals = numWithdrawals;
+        this->numWithdrawals = blockSize;
 
         constants.generate_r1cs_constraints();
 
@@ -299,9 +300,16 @@ class OnchainWithdrawalCircuit : public GadgetT
 
         // Withdrawals
         assert(withdrawals.size() == hashers.size());
+#ifdef MULTICORE
+        #pragma omp parallel for
+#endif
         for(unsigned int i = 0; i < block.withdrawals.size(); i++)
         {
             withdrawals[i].generate_r1cs_witness(block.withdrawals[i]);
+        }
+        // Cannot be done in parallel
+        for(unsigned int i = 0; i < block.withdrawals.size(); i++)
+        {
             hashers[i].generate_r1cs_witness();
         }
         // printBits("WithdrawBlockHash: 0x", hashers.back().result().bits.get_bits(pb));
@@ -312,7 +320,22 @@ class OnchainWithdrawalCircuit : public GadgetT
         return true;
     }
 
-    void printInfo()
+    bool generateWitness(const json& input) override
+    {
+        return generateWitness(input.get<Loopring::OnchainWithdrawalBlock>());
+    }
+
+    BlockType getBlockType() override
+    {
+        return BlockType::OnchainWithdrawal;
+    }
+
+    unsigned int getBlockSize() override
+    {
+        return numWithdrawals;
+    }
+
+    void printInfo() override
     {
         std::cout << pb.num_constraints() << " constraints (" << (pb.num_constraints() / numWithdrawals) << "/onchain withdrawal)" << std::endl;
     }