Revert "Allow user to ask server to save the Sprout R1CS out during startup."

This reverts commit 685c0ab07f.
This commit is contained in:
Jack Grigg 2019-06-25 15:42:45 +02:00
parent e573765641
commit 93dae1db7d
No known key found for this signature in database
GPG Key ID: 9E8255172BBF9898
3 changed files with 0 additions and 22 deletions

View File

@ -844,8 +844,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
return InitError(_("Payment disclosure requires -experimentalfeatures."));
} else if (mapArgs.count("-zmergetoaddress")) {
return InitError(_("RPC method z_mergetoaddress requires -experimentalfeatures."));
} else if (mapArgs.count("-savesproutr1cs")) {
return InitError(_("Saving the Sprout R1CS requires -experimentalfeatures."));
} else if (mapArgs.count("-insightexplorer")) {
return InitError(_("Insight explorer requires -experimentalfeatures."));
}
@ -1238,14 +1236,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
// Initialize Zcash circuit parameters
ZC_LoadParams(chainparams);
if (GetBoolArg("-savesproutr1cs", false)) {
boost::filesystem::path r1cs_path = ZC_GetParamsDir() / "r1cs";
LogPrintf("Saving Sprout R1CS to %s\n", r1cs_path.string());
pzcashParams->saveR1CS(r1cs_path.string());
}
/* Start the RPC server already. It will be started in "warmup" mode
* and not really process calls already (but it will signify connections
* that the server is there and will be ready later). Warmup mode will

View File

@ -101,16 +101,6 @@ public:
saveToFile(pkPath, keypair.pk);
}
void saveR1CS(std::string path)
{
protoboard<FieldT> pb;
joinsplit_gadget<FieldT, NumInputs, NumOutputs> g(pb);
g.generate_r1cs_constraints();
r1cs_constraint_system<FieldT> r1cs = pb.get_constraint_system();
saveToFile(path, r1cs);
}
bool verify(
const PHGRProof& proof,
ProofVerifier& verifier,

View File

@ -67,8 +67,6 @@ public:
const uint256& joinSplitPubKey
);
virtual void saveR1CS(std::string path) = 0;
// Compute nullifiers, macs, note commitments & encryptions, and SNARK proof
virtual SproutProof prove(
bool makeGrothProof,