Auto merge of #3240 - str4d:remove-obsolete-binaries, r=str4d
Remove obsolete CreateJoinSplit and GenerateParams binaries
This commit is contained in:
commit
08f74ed026
|
@ -8,10 +8,6 @@ src/zcash-gtest
|
||||||
src/zcash-tx
|
src/zcash-tx
|
||||||
src/test/test_bitcoin
|
src/test/test_bitcoin
|
||||||
|
|
||||||
# Zcash utilities
|
|
||||||
src/zcash/GenerateParams
|
|
||||||
src/zcash/CreateJoinSplit
|
|
||||||
|
|
||||||
*zcashTest.pk
|
*zcashTest.pk
|
||||||
*zcashTest.vk
|
*zcashTest.vk
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,6 @@ def check_security_hardening():
|
||||||
ret &= test_rpath_runpath('src/zcash-gtest')
|
ret &= test_rpath_runpath('src/zcash-gtest')
|
||||||
ret &= test_rpath_runpath('src/zcash-tx')
|
ret &= test_rpath_runpath('src/zcash-tx')
|
||||||
ret &= test_rpath_runpath('src/test/test_bitcoin')
|
ret &= test_rpath_runpath('src/test/test_bitcoin')
|
||||||
ret &= test_rpath_runpath('src/zcash/GenerateParams')
|
|
||||||
|
|
||||||
# NOTE: checksec.sh does not reliably determine whether FORTIFY_SOURCE
|
# NOTE: checksec.sh does not reliably determine whether FORTIFY_SOURCE
|
||||||
# is enabled for the entire binary. See issue #915.
|
# is enabled for the entire binary. See issue #915.
|
||||||
|
@ -76,7 +75,6 @@ def check_security_hardening():
|
||||||
ret &= test_fortify_source('src/zcash-gtest')
|
ret &= test_fortify_source('src/zcash-gtest')
|
||||||
ret &= test_fortify_source('src/zcash-tx')
|
ret &= test_fortify_source('src/zcash-tx')
|
||||||
ret &= test_fortify_source('src/test/test_bitcoin')
|
ret &= test_fortify_source('src/test/test_bitcoin')
|
||||||
ret &= test_fortify_source('src/zcash/GenerateParams')
|
|
||||||
|
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
|
|
|
@ -612,5 +612,3 @@ if ENABLE_TESTS
|
||||||
include Makefile.test.include
|
include Makefile.test.include
|
||||||
include Makefile.gtest.include
|
include Makefile.gtest.include
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include Makefile.zcash.include
|
|
||||||
|
|
|
@ -1,28 +0,0 @@
|
||||||
noinst_PROGRAMS += \
|
|
||||||
zcash/GenerateParams \
|
|
||||||
zcash/CreateJoinSplit
|
|
||||||
|
|
||||||
# tool for generating our public parameters
|
|
||||||
zcash_GenerateParams_SOURCES = zcash/GenerateParams.cpp
|
|
||||||
zcash_GenerateParams_CPPFLAGS = $(AM_CPPFLAGS)
|
|
||||||
zcash_GenerateParams_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
|
||||||
zcash_GenerateParams_LDADD = \
|
|
||||||
$(BOOST_LIBS) \
|
|
||||||
$(LIBZCASH) \
|
|
||||||
$(LIBSNARK) \
|
|
||||||
$(LIBBITCOIN_UTIL) \
|
|
||||||
$(LIBBITCOIN_CRYPTO) \
|
|
||||||
$(LIBZCASH_LIBS)
|
|
||||||
|
|
||||||
# tool for profiling the creation of joinsplits
|
|
||||||
zcash_CreateJoinSplit_SOURCES = zcash/CreateJoinSplit.cpp
|
|
||||||
zcash_CreateJoinSplit_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
|
|
||||||
zcash_CreateJoinSplit_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
|
||||||
zcash_CreateJoinSplit_LDADD = \
|
|
||||||
$(LIBBITCOIN_COMMON) \
|
|
||||||
$(LIBZCASH) \
|
|
||||||
$(LIBSNARK) \
|
|
||||||
$(LIBBITCOIN_UTIL) \
|
|
||||||
$(LIBBITCOIN_CRYPTO) \
|
|
||||||
$(BOOST_LIBS) \
|
|
||||||
$(LIBZCASH_LIBS)
|
|
|
@ -1,36 +0,0 @@
|
||||||
// Copyright (c) 2016 The Zcash developers
|
|
||||||
// Distributed under the MIT software license, see the accompanying
|
|
||||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
||||||
|
|
||||||
#include "../util.h"
|
|
||||||
#include "primitives/transaction.h"
|
|
||||||
#include "zcash/JoinSplit.hpp"
|
|
||||||
|
|
||||||
#include <libsnark/common/profiling.hpp>
|
|
||||||
|
|
||||||
using namespace libzcash;
|
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
|
||||||
{
|
|
||||||
libsnark::start_profiling();
|
|
||||||
|
|
||||||
auto p = ZCJoinSplit::Prepared((ZC_GetParamsDir() / "sprout-verifying.key").string(),
|
|
||||||
(ZC_GetParamsDir() / "sprout-proving.key").string());
|
|
||||||
|
|
||||||
// construct a proof.
|
|
||||||
|
|
||||||
for (int i = 0; i < 5; i++) {
|
|
||||||
uint256 anchor = ZCIncrementalMerkleTree().root();
|
|
||||||
uint256 pubKeyHash;
|
|
||||||
|
|
||||||
JSDescription jsdesc(*p,
|
|
||||||
pubKeyHash,
|
|
||||||
anchor,
|
|
||||||
{JSInput(), JSInput()},
|
|
||||||
{JSOutput(), JSOutput()},
|
|
||||||
0,
|
|
||||||
0);
|
|
||||||
}
|
|
||||||
|
|
||||||
delete p; // not that it matters
|
|
||||||
}
|
|
|
@ -1,24 +0,0 @@
|
||||||
#include "zcash/JoinSplit.hpp"
|
|
||||||
|
|
||||||
#include <iostream>
|
|
||||||
#include "crypto/common.h"
|
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
|
||||||
{
|
|
||||||
if (init_and_check_sodium() == -1) {
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(argc != 4) {
|
|
||||||
std::cerr << "Usage: " << argv[0] << " provingKeyFileName verificationKeyFileName r1csFileName" << std::endl;
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string pkFile = argv[1];
|
|
||||||
std::string vkFile = argv[2];
|
|
||||||
std::string r1csFile = argv[3];
|
|
||||||
|
|
||||||
ZCJoinSplit::Generate(r1csFile, vkFile, pkFile);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
Loading…
Reference in New Issue