DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Auto merge of #2739 - str4d:2736-gitian-libsnark-bug, r=str4d

Browse Source 
Fix Gitian bugs caused by bringing libsnark in-tree

Closes #2736.
This commit is contained in:
Homu
2017-11-17 08:17:25 -08:00
parent c1282bebb8 051698a05c
commit 2c72e703c5
10 changed files with 41 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@@ -24,7 +24,7 @@ dnl faketime breaks configure and is only needed for make. Disable it here.
unset FAKETIME unset FAKETIME
dnl Automake init set-up and checks dnl Automake init set-up and checks
AM_INIT_AUTOMAKE([no-define subdir-objects foreign]) AM_INIT_AUTOMAKE([no-define subdir-objects foreign tar-pax])
dnl faketime messes with timestamps and causes configure to be re-run. dnl faketime messes with timestamps and causes configure to be re-run.
dnl --disable-maintainer-mode can be used to bypass this. dnl --disable-maintainer-mode can be used to bypass this.
@@ -762,6 +762,14 @@ if test x$enable_rust != xno; then
RUST_LIBS="-lrustzcash" RUST_LIBS="-lrustzcash"
fi fi
# Gitian uses a config.site that sets depends_prefix, and then sets --prefix=/
# build.sh just uses --prefix
if test x$depends_prefix != x; then
LIBSNARK_DEPINST="$depends_prefix"
else
LIBSNARK_DEPINST="$prefix"
fi
LIBZCASH_LIBS="-lgmp -lgmpxx -lboost_system-mt -lcrypto -lsodium -fopenmp $RUST_LIBS" LIBZCASH_LIBS="-lgmp -lgmpxx -lboost_system-mt -lcrypto -lsodium -fopenmp $RUST_LIBS"
CXXFLAGS_TEMP="$CXXFLAGS" CXXFLAGS_TEMP="$CXXFLAGS"
@@ -897,7 +905,7 @@ AC_SUBST(TESTDEFS)
AC_SUBST(LEVELDB_TARGET_FLAGS) AC_SUBST(LEVELDB_TARGET_FLAGS)
AC_SUBST(GMP_LIBS) AC_SUBST(GMP_LIBS)
AC_SUBST(GMPXX_LIBS) AC_SUBST(GMPXX_LIBS)
AC_SUBST(LIBSNARK_LIBS) AC_SUBST(LIBSNARK_DEPINST)
AC_SUBST(LIBZCASH_LIBS) AC_SUBST(LIBZCASH_LIBS)
AC_SUBST(PROTON_LIBS) AC_SUBST(PROTON_LIBS)
AC_CONFIG_FILES([Makefile src/Makefile doc/man/Makefile share/setup.nsi src/test/buildenv.py]) AC_CONFIG_FILES([Makefile src/Makefile doc/man/Makefile share/setup.nsi src/test/buildenv.py])

8
src/Makefile.am
View File

@@ -1,4 +1,4 @@
DIST_SUBDIRS = secp256k1 snark univalue DIST_SUBDIRS = secp256k1 univalue
AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS)
@@ -49,10 +49,10 @@ LIBSNARK_CXXFLAGS = -fPIC -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1
LIBSNARK_CONFIG_FLAGS = CURVE=ALT_BN128 MULTICORE=1 NO_PROCPS=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT NO_COPY_DEPINST=1 LIBSNARK_CONFIG_FLAGS = CURVE=ALT_BN128 MULTICORE=1 NO_PROCPS=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT NO_COPY_DEPINST=1
$(LIBSNARK): $(wildcard snark/src/*) $(LIBSNARK): $(wildcard snark/src/*)
$(AM_V_at) CXXFLAGS="$(LIBSNARK_CXXFLAGS)" $(MAKE) $(AM_MAKEFLAGS) -C snark/ install PREFIX=$(srcdir)/build DEPINST=$(prefix) $(LIBSNARK_CONFIG_FLAGS) OPTFLAGS="-O2 -march=x86-64" $(AM_V_at) CXXFLAGS="$(LIBSNARK_CXXFLAGS)" $(MAKE) $(AM_MAKEFLAGS) -C snark/ install PREFIX=$(srcdir)/build DEPINST="$(LIBSNARK_DEPINST)" $(LIBSNARK_CONFIG_FLAGS) OPTFLAGS="-O2 -march=x86-64"
libsnark-tests: $(wildcard snark/src/*) libsnark-tests: $(wildcard snark/src/*)
$(AM_V_at) CXXFLAGS="$(LIBSNARK_CXXFLAGS)" $(MAKE) $(AM_MAKEFLAGS) -C snark/ check PREFIX=$(srcdir)/build DEPINST=$(prefix) $(LIBSNARK_CONFIG_FLAGS) OPTFLAGS="-O2 -march=x86-64" $(AM_V_at) CXXFLAGS="$(LIBSNARK_CXXFLAGS)" $(MAKE) $(AM_MAKEFLAGS) -C snark/ check PREFIX=$(srcdir)/build DEPINST="$(LIBSNARK_DEPINST)" $(LIBSNARK_CONFIG_FLAGS) OPTFLAGS="-O2 -march=x86-64"
$(LIBUNIVALUE): $(wildcard univalue/lib/*) $(LIBUNIVALUE): $(wildcard univalue/lib/*)
$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue/ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue/
@@ -553,7 +553,7 @@ CLEANFILES = leveldb/libleveldb.a leveldb/libmemenv.a *.gcda *.gcno */*.gcno wal
DISTCLEANFILES = obj/build.h DISTCLEANFILES = obj/build.h
EXTRA_DIST = leveldb EXTRA_DIST = leveldb snark
clean-local: clean-local:
-$(MAKE) -C leveldb clean -$(MAKE) -C leveldb clean

6
src/gtest/main.cpp
View File

@@ -1,12 +1,12 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "crypto/common.h" #include "crypto/common.h"
#include "pubkey.h" #include "pubkey.h"
#include "libsnark/common/default_types/r1cs_ppzksnark_pp.hpp"
#include "libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp"
#include "zcash/JoinSplit.hpp" #include "zcash/JoinSplit.hpp"
#include "util.h" #include "util.h"
#include <libsnark/common/default_types/r1cs_ppzksnark_pp.hpp>
#include <libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp>
struct ECCryptoClosure struct ECCryptoClosure
{ {
ECCVerifyHandle handle; ECCVerifyHandle handle;

9
src/gtest/test_circuit.cpp
View File

@@ -7,10 +7,11 @@
#include <boost/format.hpp> #include <boost/format.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include "libsnark/common/default_types/r1cs_ppzksnark_pp.hpp" #include <libsnark/common/default_types/r1cs_ppzksnark_pp.hpp>
#include "libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp" #include <libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp>
#include "libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp" #include <libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp>
#include "libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp" #include <libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp>
#include "zcash/IncrementalMerkleTree.hpp" #include "zcash/IncrementalMerkleTree.hpp"
using namespace libsnark; using namespace libsnark;

8
src/gtest/test_merkletree.cpp
View File

@@ -19,10 +19,10 @@
#include "zcash/IncrementalMerkleTree.hpp" #include "zcash/IncrementalMerkleTree.hpp"
#include "zcash/util.h" #include "zcash/util.h"
#include "libsnark/common/default_types/r1cs_ppzksnark_pp.hpp" #include <libsnark/common/default_types/r1cs_ppzksnark_pp.hpp>
#include "libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp" #include <libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp>
#include "libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp" #include <libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp>
#include "libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp" #include <libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>

7
src/gtest/test_proofs.cpp
View File

@@ -3,10 +3,9 @@
#include <iostream> #include <iostream>
#include "libsnark/common/default_types/r1cs_ppzksnark_pp.hpp" #include <libsnark/common/default_types/r1cs_ppzksnark_pp.hpp>
#include "libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp" #include <libsnark/relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp>
#include "zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp" #include <libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp>
#include "relations/constraint_satisfaction_problems/r1cs/examples/r1cs_examples.hpp"
using namespace libzcash; using namespace libzcash;

2
src/init.cpp
View File

@@ -53,7 +53,7 @@
#include <boost/thread.hpp> #include <boost/thread.hpp>
#include <openssl/crypto.h> #include <openssl/crypto.h>
#include "libsnark/common/profiling.hpp" #include <libsnark/common/profiling.hpp>
#if ENABLE_ZMQ #if ENABLE_ZMQ
#include "zmq/zmqnotificationinterface.h" #include "zmq/zmqnotificationinterface.h"

3
src/zcash/CreateJoinSplit.cpp
View File

@@ -5,7 +5,8 @@
#include "../util.h" #include "../util.h"
#include "primitives/transaction.h" #include "primitives/transaction.h"
#include "zcash/JoinSplit.hpp" #include "zcash/JoinSplit.hpp"
#include "libsnark/common/profiling.hpp"
#include <libsnark/common/profiling.hpp>
using namespace libzcash; using namespace libzcash;

8
src/zcash/JoinSplit.cpp
View File

@@ -10,10 +10,10 @@
#include <boost/format.hpp> #include <boost/format.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <fstream> #include <fstream>
#include "libsnark/common/default_types/r1cs_ppzksnark_pp.hpp" #include <libsnark/common/default_types/r1cs_ppzksnark_pp.hpp>
#include "libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp" #include <libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp>
#include "libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp" #include <libsnark/gadgetlib1/gadgets/hashes/sha256/sha256_gadget.hpp>
#include "libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp" #include <libsnark/gadgetlib1/gadgets/merkle_tree/merkle_tree_check_read_gadget.hpp>
#include "tinyformat.h" #include "tinyformat.h"
#include "sync.h" #include "sync.h"
#include "amount.h" #include "amount.h"

10
src/zcash/Proof.cpp
View File

@@ -1,11 +1,11 @@
#include "Proof.hpp" #include "Proof.hpp"
#include <boost/static_assert.hpp>
#include <mutex>
#include "crypto/common.h" #include "crypto/common.h"
#include "libsnark/common/default_types/r1cs_ppzksnark_pp.hpp"
#include "libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp" #include <boost/static_assert.hpp>
#include <libsnark/common/default_types/r1cs_ppzksnark_pp.hpp>
#include <libsnark/zk_proof_systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark.hpp>
#include <mutex>
using namespace libsnark; using namespace libsnark;