Skip to content

Commit dab1e41

Browse files
onsightitonsightit
committed
removed zerocoin
1 parent 7646a29 commit dab1e41

33 files changed

Lines changed: 7 additions & 3149 deletions

‎solarcoin-qt.pro‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -267,17 +267,6 @@ HEADERS += src/qt/bitcoingui.h \
267267
src/scrypt.h \
268268
src/pbkdf2.h \
269269
src/allocators.h \
270-
src/zerocoin/Accumulator.h \
271-
src/zerocoin/AccumulatorProofOfKnowledge.h \
272-
src/zerocoin/Coin.h \
273-
src/zerocoin/CoinSpend.h \
274-
src/zerocoin/Commitment.h \
275-
src/zerocoin/ParamGeneration.h \
276-
src/zerocoin/Params.h \
277-
src/zerocoin/SerialNumberSignatureOfKnowledge.h \
278-
src/zerocoin/SpendMetaData.h \
279-
src/zerocoin/ZeroTest.h \
280-
src/zerocoin/Zerocoin.h \
281270
src/serialize.h \
282271
src/strlcpy.h \
283272
src/main.h \
@@ -433,19 +422,9 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
433422
src/scrypt-x86_64.S \
434423
src/scrypt.cpp \
435424
src/pbkdf2.cpp \
436-
src/zerocoin/Accumulator.cpp \
437-
src/zerocoin/AccumulatorProofOfKnowledge.cpp \
438-
src/zerocoin/Coin.cpp \
439-
src/zerocoin/CoinSpend.cpp \
440-
src/zerocoin/Commitment.cpp \
441-
src/zerocoin/ParamGeneration.cpp \
442-
src/zerocoin/Params.cpp \
443-
src/zerocoin/SerialNumberSignatureOfKnowledge.cpp \
444-
src/zerocoin/SpendMetaData.cpp \
445425
src/qt/webview.cpp \
446426
src/qt/postdialog.cpp \
447427
src/qt/whatsnewdialog.cpp \
448-
src/zerocoin/ZeroTest.cpp \
449428
src/hash.cpp \
450429
src/bloom.cpp
451430

‎src/init.cpp‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include "util.h"
1111
#include "ui_interface.h"
1212
#include "checkpoints.h"
13-
#include "zerocoin/ZeroTest.h"
1413
#include <boost/filesystem.hpp>
1514
#include <boost/filesystem/fstream.hpp>
1615
#include <boost/filesystem/convenience.hpp>
@@ -882,16 +881,6 @@ bool AppInit2()
882881
return false;
883882
}
884883

885-
// ********************************************************* Testing Zerocoin
886-
887-
888-
if (GetBoolArg("-zerotest", false))
889-
{
890-
printf("\n=== ZeroCoin tests start ===\n");
891-
Test_RunAllTests();
892-
printf("=== ZeroCoin tests end ===\n\n");
893-
}
894-
895884
// ********************************************************* Step 8: load wallet
896885

897886
uiInterface.InitMessage(_("Loading wallet..."));

‎src/main.cpp‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include "init.h"
1515
#include "ui_interface.h"
1616
#include "kernel.h"
17-
#include "zerocoin/Zerocoin.h"
1817
#include "bitcoinrpc.h"
1918
#include <boost/algorithm/string/replace.hpp>
2019
#include <boost/filesystem.hpp>
@@ -39,7 +38,6 @@ unsigned int nTransactionsUpdated = 0;
3938

4039
map<uint256, CBlockIndex*> mapBlockIndex;
4140
set<pair<COutPoint, unsigned int> > setStakeSeen;
42-
libzerocoin::Params* ZCParams;
4341

4442
CBigNum bnProofOfWorkLimit(~uint256(0) >> 20); // "standard" scrypt target limit for proof of work, results with 0,000244140625 proof-of-work difficulty
4543
CBigNum bnProofOfStakeLimit(~uint256(0) >> 20);
@@ -3276,11 +3274,6 @@ bool LoadBlockIndex(bool fAllowNew)
32763274
bnTrustedModulus.SetHex("d01f952e1090a5a72a3eda261083256596ccc192935ae1454c2bafd03b09e6ed11811be9f3a69f5783bbbced8c6a0c56621f42c2d19087416facf2f13cc7ed7159d1c5253119612b8449f0c7f54248e382d30ecab1928dbf075c5425dcaee1a819aa13550e0f3227b8c685b14e0eae094d65d8a610a6f49fff8145259d1187e4c6a472fa5868b2b67f957cb74b787f4311dbc13c97a2ca13acdb876ff506ebecbb904548c267d68868e07a32cd9ed461fbc2f920e9940e7788fed2e4817f274df5839c2196c80abe5c486df39795186d7bc86314ae1e8342f3c884b158b4b05b4302754bf351477d35370bad6639b2195d30006b77bf3dbb28b848fd9ecff5662bf39dde0c974e83af51b0d3d642d43834827b8c3b189065514636b8f2a59c42ba9b4fc4975d4827a5d89617a3873e4b377b4d559ad165748632bd928439cfbc5a8ef49bc2220e0b15fb0aa302367d5e99e379a961c1bc8cf89825da5525e3c8f14d7d8acca2fa9c133a2176ae69874d8b1d38b26b9c694e211018005a97b40848681b9dd38feb2de141626fb82591aad20dc629b2b6421cef1227809551a0e4e943ab99841939877f18f2d9c0addc93cf672e26b02ed94da3e6d329e8ac8f3736eebbf37bb1a21e5aadf04ee8e3b542f876aa88b2adf2608bd86329b7f7a56fd0dc1c40b48188731d11082aea360c62a0840c2db3dad7178fd7e359317ae081");
32773275
}
32783276

3279-
#if 0
3280-
// Set up the Zerocoin Params object
3281-
ZCParams = new libzerocoin::Params(bnTrustedModulus);
3282-
#endif
3283-
32843277
//
32853278
// Load block index
32863279
//

‎src/main.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include "net.h"
1111
#include "script.h"
1212
#include "scrypt.h"
13-
#include "zerocoin/Zerocoin.h"
1413

1514
#include <list>
1615

@@ -84,7 +83,6 @@ static const uint256 hashGenesisBlockTestNet("0x03a1676077275a4bf288ef3258d890ea
8483
inline int64_t PastDrift(int64_t nTime) { return nTime - 10 * 60; } // up to 10 minutes from the past
8584
inline int64_t FutureDrift(int64_t nTime) { return nTime + 10 * 60; } // up to 10 minutes from the future
8685

87-
extern libzerocoin::Params* ZCParams;
8886
extern CScript COINBASE_FLAGS;
8987
extern CCriticalSection cs_main;
9088
extern std::map<uint256, CBlockIndex*> mapBlockIndex;

‎src/makefile.bsd‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -133,17 +133,7 @@ OBJS= \
133133
obj/scrypt.o \
134134
obj/scrypt-arm.o \
135135
obj/scrypt-x86.o \
136-
obj/scrypt-x86_64.o \
137-
obj/zerocoin/Accumulator.o \
138-
obj/zerocoin/AccumulatorProofOfKnowledge.o \
139-
obj/zerocoin/Coin.o \
140-
obj/zerocoin/CoinSpend.o \
141-
obj/zerocoin/Commitment.o \
142-
obj/zerocoin/ParamGeneration.o \
143-
obj/zerocoin/Params.o \
144-
obj/zerocoin/SerialNumberSignatureOfKnowledge.o \
145-
obj/zerocoin/SpendMetaData.o \
146-
obj/zerocoin/ZeroTest.o
136+
obj/scrypt-x86_64.o
147137

148138
all: solarcoind
149139

@@ -179,22 +169,13 @@ obj/%.o: %.cpp
179169
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
180170
rm -f $(@:%.o=%.d)
181171

182-
obj/zerocoin/%.o: zerocoin/%.cpp
183-
$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
184-
@cp $(@:%.o=%.d) $(@:%.o=%.P); \
185-
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
186-
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
187-
rm -f $(@:%.o=%.d)
188-
189172
solarcoind: $(OBJS:obj/%=obj/%)
190173
$(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS)
191174

192175
clean:
193176
-rm -f solarcoind
194177
-rm -f obj/*.o
195-
-rm -f obj/zerocoin/*.o
196178
-rm -f obj/*.P
197-
-rm -f obj/zerocoin/*.P
198179
-rm -f obj/build.h
199180

200181
FORCE:

‎src/makefile.linux-mingw‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -95,17 +95,7 @@ OBJS= \
9595
obj/pbkdf2.o \
9696
obj/scrypt.o \
9797
obj/scrypt-x86.o \
98-
obj/scrypt-x86_64.o \
99-
obj/zerocoin/Accumulator.o \
100-
obj/zerocoin/AccumulatorProofOfKnowledge.o \
101-
obj/zerocoin/Coin.o \
102-
obj/zerocoin/CoinSpend.o \
103-
obj/zerocoin/Commitment.o \
104-
obj/zerocoin/ParamGeneration.o \
105-
obj/zerocoin/Params.o \
106-
obj/zerocoin/SerialNumberSignatureOfKnowledge.o \
107-
obj/zerocoin/SpendMetaData.o \
108-
obj/zerocoin/ZeroTest.o
98+
obj/scrypt-x86_64.o
10999

110100
all: solarcoind.exe
111101

@@ -125,9 +115,6 @@ DEFS += -DHAVE_BUILD_INFO
125115
obj/%.o: %.cpp $(HEADERS)
126116
$(CXX) -c $(CFLAGS) -o $@ $<
127117

128-
obj/zerocoin/%.o: zerocoin/%.cpp $(HEADERS)
129-
$(CXX) -c $(CFLAGS) -o $@ $<
130-
131118
solarcoind.exe: $(OBJS:obj/%=obj/%)
132119
$(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) -lshlwapi
133120
$(STRIP) solarcoind.exe
@@ -140,7 +127,6 @@ obj/scrypt-x86_64.o: scrypt-x86_64.S
140127

141128
clean:
142129
-rm -f obj/*.o
143-
-rm -f obj/zerocoin/*.o
144130
-rm -f solarcoind.exe
145131
-rm -f obj/build.h
146132
cd leveldb && TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) clean && cd ..

‎src/makefile.mingw‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -95,17 +95,7 @@ OBJS= \
9595
obj/pbkdf2.o \
9696
obj/scrypt.o \
9797
obj/scrypt-x86.o \
98-
obj/scrypt-x86_64.o \
99-
obj/zerocoin/Accumulator.o \
100-
obj/zerocoin/AccumulatorProofOfKnowledge.o \
101-
obj/zerocoin/Coin.o \
102-
obj/zerocoin/CoinSpend.o \
103-
obj/zerocoin/Commitment.o \
104-
obj/zerocoin/ParamGeneration.o \
105-
obj/zerocoin/Params.o \
106-
obj/zerocoin/SerialNumberSignatureOfKnowledge.o \
107-
obj/zerocoin/SpendMetaData.o \
108-
obj/zerocoin/ZeroTest.o
98+
obj/scrypt-x86_64.o
10999

110100
all: solarcoind.exe
111101

@@ -120,9 +110,6 @@ obj/txdb-leveldb.o: leveldb/libleveldb.a
120110
obj/%.o: %.cpp $(HEADERS)
121111
g++ -c $(CFLAGS) -o $@ $<
122112

123-
obj/zerocoin/%.o: zerocoin/%.cpp
124-
g++ -c $(CFLAGS) -o $@ $<
125-
126113
obj/scrypt-x86.o: scrypt-x86.S
127114
$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
128115

@@ -134,8 +121,7 @@ solarcoind.exe: $(OBJS:obj/%=obj/%)
134121

135122
clean:
136123
rm -f solarcoind.exe
137-
rm -f obj/*.o
138-
rm -f obj/zerocoin/*.o
124+
rm -f obj/*.o
139125
cd leveldb && make TARGET_OS=NATIVE_WINDOWS clean && cd ..
140126

141127
FORCE:

‎src/makefile.osx‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -99,17 +99,7 @@ OBJS= \
9999
obj/kernel.o \
100100
obj/scrypt.o \
101101
obj/scrypt-x86.o \
102-
obj/scrypt-x86_64.o \
103-
obj/zerocoin/Accumulator.o \
104-
obj/zerocoin/AccumulatorProofOfKnowledge.o \
105-
obj/zerocoin/Coin.o \
106-
obj/zerocoin/CoinSpend.o \
107-
obj/zerocoin/Commitment.o \
108-
obj/zerocoin/ParamGeneration.o \
109-
obj/zerocoin/Params.o \
110-
obj/zerocoin/SerialNumberSignatureOfKnowledge.o \
111-
obj/zerocoin/SpendMetaData.o \
112-
obj/zerocoin/ZeroTest.o
102+
obj/scrypt-x86_64.o
113103

114104
ifndef USE_UPNP
115105
override USE_UPNP = -
@@ -152,13 +142,6 @@ obj/%.o: %.cpp
152142
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
153143
rm -f $(@:%.o=%.d)
154144

155-
obj/zerocoin/%.o: zerocoin/%.cpp
156-
$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
157-
@cp $(@:%.o=%.d) $(@:%.o=%.P); \
158-
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
159-
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
160-
rm -f $(@:%.o=%.d)
161-
162145
obj/scrypt-x86.o: scrypt-x86.S
163146
$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
164147

@@ -171,9 +154,7 @@ solarcoind: $(OBJS:obj/%=obj/%)
171154
clean:
172155
-rm -f solarcoind
173156
-rm -f obj/*.o
174-
-rm -f obj/zerocoin/*.o
175157
-rm -f obj/*.P
176-
-rm -f obj/zerocoin/*.P
177158
-rm -f obj/build.h
178159

179160
FORCE:

‎src/makefile.unix‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -139,17 +139,7 @@ OBJS= \
139139
obj/scrypt.o \
140140
obj/scrypt-arm.o \
141141
obj/scrypt-x86.o \
142-
obj/scrypt-x86_64.o \
143-
obj/zerocoin/Accumulator.o \
144-
obj/zerocoin/AccumulatorProofOfKnowledge.o \
145-
obj/zerocoin/Coin.o \
146-
obj/zerocoin/CoinSpend.o \
147-
obj/zerocoin/Commitment.o \
148-
obj/zerocoin/ParamGeneration.o \
149-
obj/zerocoin/Params.o \
150-
obj/zerocoin/SerialNumberSignatureOfKnowledge.o \
151-
obj/zerocoin/SpendMetaData.o \
152-
obj/zerocoin/ZeroTest.o
142+
obj/scrypt-x86_64.o
153143

154144
all: solarcoind
155145

@@ -185,22 +175,13 @@ obj/%.o: %.cpp
185175
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
186176
rm -f $(@:%.o=%.d)
187177

188-
obj/zerocoin/%.o: zerocoin/%.cpp
189-
$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
190-
@cp $(@:%.o=%.d) $(@:%.o=%.P); \
191-
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
192-
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
193-
rm -f $(@:%.o=%.d)
194-
195178
solarcoind: $(OBJS:obj/%=obj/%)
196179
$(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS)
197180

198181
clean:
199182
-rm -f solarcoind
200183
-rm -f obj/*.o
201-
-rm -f obj/zerocoin/*.o
202184
-rm -f obj/*.P
203-
-rm -f obj/zerocoin/*.P
204185
-rm -f obj/build.h
205186
cd leveldb; make clean; cd ..;
206187

‎src/obj/zerocoin/.gitignore‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)