Ripping out non-RIC code

xptMiner/Makefile

@@ -59,29 +59,21 @@ OBJS = \
 	xptMiner/main.o \
 	xptMiner/sha2.o \
 	xptMiner/xptClient.o \
-	xptMiner/protosharesMiner.o \
-	xptMiner/primecoinMiner.o \
-	xptMiner/keccak.o \
-	xptMiner/metis.o \
 	xptMiner/shavite.o \
-	xptMiner/scrypt.o \
-	xptMiner/scryptMinerCPU.o \
 	xptMiner/xptClientPacketHandler.o \
 	xptMiner/xptPacketbuffer.o \
 	xptMiner/xptServer.o \
 	xptMiner/xptServerPacketHandler.o \
 	xptMiner/transaction.o \
-	xptMiner/riecoinMiner.o \
-	xptMiner/metiscoinMiner.o 
+	xptMiner/riecoinMiner.o
+
 
 ifeq ($(ENABLE_OPENCL),1)
 	OBJS += xptMiner/OpenCLObjects.o 
         OBJS += xptMiner/openCL.o
-	OBJS += xptMiner/maxcoinMinerCL.o 
 	CXXFLAGS += -DUSE_OPENCL
 	LIBS += -lOpenCL
 else
-	OBJS += xptMiner/maxcoinMiner.o 
 
 endif
 

xptMiner/README.md

@@ -1,10 +1,9 @@
 xptMiner
 ========
 
-This is a Riecoin (RIC)-focused release built upon xptMiner.  No
-components of it outside of Riecoin mining are maintained.
-
-xptMiner itself is a multi-algorithm miner and reference implementation of the xpt protocol.
+This is a Riecoin (RIC)-focused release built upon xptMiner.  It
+contains only a Riecoin miner - for the reference implementation
+of xptMiner, please see https://github.com/jh000/xptMiner
 
 This build supports Linux and Windows, the latter via the Makefile.mingw.
 
@@ -50,4 +49,4 @@ make clean
 LD_LIBRARY_PATH=/usr/local/lib make -j4 -f Makefile.nomarch
 
 
-This has a 0% donation which can be set using the -d option (-d 2.5 would be 2.5% donation)
+This has a default 2% donation that can be set using the -d option (-d 2.5 would be 2.5% donation)

xptMiner/xptMiner/algorithm.h

@@ -1,20 +1,2 @@
-// protoshares
-void protoshares_process_512(minerProtosharesBlock_t* block);
-void protoshares_process_256(minerProtosharesBlock_t* block);
-void protoshares_process_128(minerProtosharesBlock_t* block);
-void protoshares_process_32(minerProtosharesBlock_t* block);
-void protoshares_process_8(minerProtosharesBlock_t* block);
-// scrypt
-void scrypt_process_cpu(minerScryptBlock_t* block);
-// primecoin
-void primecoin_process(minerPrimecoinBlock_t* block);
-// metiscoin
-void metiscoin_init();
-void metiscoin_process(minerMetiscoinBlock_t* block);
-// maxcoin
-void maxcoin_init();
-void maxcoin_process(minerMaxcoinBlock_t* block);
-void maxcoin_processGPU(minerMaxcoinBlock_t* block);
-// riecoin
 void riecoin_init(uint64_t sieveMax);
 void riecoin_process(minerRiecoinBlock_t* block);

xptMiner/xptMiner/global.h

@@ -100,9 +100,6 @@ typedef struct
 #include"xptClient.h"
 
 #include"sha2.h"
-#include"sph_keccak.h"
-#include"sph_metis.h"
-#include"sph_shavite.h"
 
 #include"transaction.h"
 
@@ -128,94 +125,6 @@ extern minerSettings_t minerSettings;
 
 // block data struct
 
-typedef struct  
-{
-	// block header data (relevant for midhash)
-	uint32	version;
-	uint8	prevBlockHash[32];
-	uint8	merkleRoot[32];
-	uint32	nTime;
-	uint32	nBits;
-	uint32	nonce;
-	// birthday collision
-	uint32	birthdayA;
-	uint32	birthdayB;
-	uint32	uniqueMerkleSeed;
-
-	uint32	height;
-	uint8	merkleRootOriginal[32]; // used to identify work
-	uint8	target[32];
-	uint8	targetShare[32];
-}minerProtosharesBlock_t;
-
-typedef struct  
-{
-	// block header data
-	uint32	version;
-	uint8	prevBlockHash[32];
-	uint8	merkleRoot[32];
-	uint32	nTime;
-	uint32	nBits;
-	uint32	nonce;
-	uint32	uniqueMerkleSeed;
-	uint32	height;
-	uint8	merkleRootOriginal[32]; // used to identify work
-	uint8	target[32];
-	uint8	targetShare[32];
-}minerScryptBlock_t;
-
-typedef struct  
-{
-	// block header data
-	uint32	version;
-	uint8	prevBlockHash[32];
-	uint8	merkleRoot[32];
-	uint32	nTime;
-	uint32	nBits;
-	uint32	nonce;
-	uint32	uniqueMerkleSeed;
-	uint32	height;
-	uint8	merkleRootOriginal[32]; // used to identify work
-	uint8	target[32];
-	uint8	targetShare[32];
-	// found chain data
-	// todo
-}minerPrimecoinBlock_t;
-
-typedef struct  
-{
-	// block data (order and memory layout is important)
-	uint32	version;
-	uint8	prevBlockHash[32];
-	uint8	merkleRoot[32];
-	uint32	nTime;
-	uint32	nBits;
-	uint32	nonce;
-	// remaining data
-	uint32	uniqueMerkleSeed;
-	uint32	height;
-	uint8	merkleRootOriginal[32]; // used to identify work
-	uint8	target[32];
-	uint8	targetShare[32];
-}minerMetiscoinBlock_t; // identical to scryptBlock
-
-typedef struct  
-{
-	// block data (order and memory layout is important)
-	uint32	version;
-	uint8	prevBlockHash[32];
-	uint8	merkleRoot[32];
-	uint32	nTime;
-	uint32	nBits;
-	uint32	nonce;
-	// remaining data
-	uint32	uniqueMerkleSeed;
-	uint32	height;
-	uint8	merkleRootOriginal[32]; // used to identify work
-	uint8	target[32];
-	uint8	targetShare[32];
-}minerMaxcoinBlock_t; // identical to scryptBlock
-
 
 typedef struct  
 {
@@ -237,15 +146,9 @@ typedef struct
 	uint32  shareTargetCompact;
 }minerRiecoinBlock_t;
 
-#include"scrypt.h"
 #include"algorithm.h"
 
 
-void xptMiner_submitShare(minerProtosharesBlock_t* block);
-void xptMiner_submitShare(minerScryptBlock_t* block);
-void xptMiner_submitShare(minerPrimecoinBlock_t* block);
-void xptMiner_submitShare(minerMetiscoinBlock_t* block);
-void xptMiner_submitShare(minerMaxcoinBlock_t* block);
 void xptMiner_submitShare(minerRiecoinBlock_t* block, uint8* nOffset);
 
 // stats