From b2de7d1ae26b42fc2bbd3c7191dddf0c8a42b585 Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Mon, 6 May 2019 15:35:25 +0800 Subject: [PATCH] remove some labs stuff --- src/cc/CCtx.cpp | 2 +- src/cc/makecclib | 16 ++++++++-------- src/cc/makecustom | 7 +++---- src/wallet/db.h | 6 +++--- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/cc/CCtx.cpp b/src/cc/CCtx.cpp index fe5fade71..7435defbf 100644 --- a/src/cc/CCtx.cpp +++ b/src/cc/CCtx.cpp @@ -241,7 +241,7 @@ std::string FinalizeCCTx(uint64_t CCmask,struct CCcontract_info *cp,CMutableTran { char coinaddr[64]; GetCCaddress1of2(cp,coinaddr,globalpk,pubkeys[i]); - fprintf(stderr,"%s + %s -> %s vs %s\n",HexStr(globalpk).c_str(),HexStr(pubkeys[i]).c_str(),coinaddr,destaddr); + //fprintf(stderr,"%s + %s -> %s vs %s\n",HexStr(globalpk).c_str(),HexStr(pubkeys[i]).c_str(),coinaddr,destaddr); if ( strcmp(destaddr,coinaddr) == 0 ) { privkey = cp->CCpriv; diff --git a/src/cc/makecclib b/src/cc/makecclib index 256d50995..e4816c55c 100755 --- a/src/cc/makecclib +++ b/src/cc/makecclib @@ -7,14 +7,14 @@ make -f Makefile_rogue rm ../libcc.so cp librogue.so ../libcc.so -#echo sudoku/musig/dilithium -#gcc -O3 -std=c++11 -I../secp256k1/include -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared -c -o sudokucc.so cclib.cpp +echo sudoku/musig/dilithium +gcc -O3 -std=c++11 -I../secp256k1/include -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared -c -o sudokucc.so cclib.cpp -#echo games tetris -#./maketetris +echo games tetris +./maketetris -#echo games prices -#./makeprices +echo games prices +./makeprices -#echo customcc stub -#gcc -O3 -DBUILD_CUSTOMCC -std=c++11 -I../secp256k1/include -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared -c -o customcc.so cclib.cpp +echo customcc stub +gcc -O3 -DBUILD_CUSTOMCC -std=c++11 -I../secp256k1/include -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared -c -o customcc.so cclib.cpp diff --git a/src/cc/makecustom b/src/cc/makecustom index 06f2f6fb1..154be4f31 100755 --- a/src/cc/makecustom +++ b/src/cc/makecustom @@ -1,7 +1,6 @@ #!/bin/sh gcc -O3 -DBUILD_CUSTOMCC -std=c++11 -I../secp256k1/include -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared -c -o customcc.so cclib.cpp cp customcc.so ../libcc.so -#cd .. -#make -#cd cc - +cd .. +make +cd cc diff --git a/src/wallet/db.h b/src/wallet/db.h index 4af25c698..e1ae52909 100644 --- a/src/wallet/db.h +++ b/src/wallet/db.h @@ -33,9 +33,9 @@ #include -// CCLIB fails to compile with this! -//#include -#include "../depends/x86_64-unknown-linux-gnu/include/db_cxx.h" +// If CCLIB fails to compile with this, use the one below. +#include +//#include "../depends/x86_64-unknown-linux-gnu/include/db_cxx.h" extern unsigned int nWalletDBUpdated;