Skip to content

Commit

Permalink
last minute changes to repo (v0.1 release)
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian Buchner authored and Christian Buchner committed Mar 18, 2014
1 parent 6aac3fb commit f67ee69
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 9 deletions.
4 changes: 2 additions & 2 deletions README.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

HeavyCUDA release Mar 18th 2014 - Initial Release
ccMiner release Mar 18th 2014 - Initial Release
-------------------------------------------------------------

***************************************************************
Expand Down Expand Up @@ -108,7 +108,7 @@ and also many thanks to anyone else who contributed to the original
cpuminer application (Jeff Garzik, pooler), it's original HVC-fork
and the HVC-fork available at hvc.1gh.com

Source code is included to satisfy GNU GPL V2 requirements.
Source code is included to satisfy GNU GPL V3 requirements.


With kind regards,
Expand Down
14 changes: 7 additions & 7 deletions cpu-miner.c
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,8 @@ static char const usage[] = "\
Usage: " PROGRAM_NAME " [OPTIONS]\n\
Options:\n\
-a, --algo=ALGO specify the algorithm to use\n\
scrypt scrypt(1024, 1, 1) (default)\n\
sha256d SHA-256d\n\
heavy Heavycoin hash\n\
fugue256 Fuguecoin hash\n\
heavy Heavycoin hash\n\
-v, --vote=VOTE block reward vote\n\
-m, --trust-pool trust the max block reward vote (maxvote) sent by the pool\n\
-o, --url=URL URL of mining server\n\
Expand All @@ -190,7 +189,7 @@ Options:\n\
-p, --pass=PASSWORD password for mining server\n\
--cert=FILE certificate for mining server using SSL\n\
-x, --proxy=[PROTOCOL://]HOST[:PORT] connect through a proxy\n\
-t, --threads=N number of miner threads (default: number of processors)\n\
-t, --threads=N number of miner threads (default: number of nVidia GPUs)\n\
-r, --retries=N number of times to retry if a network call fails\n\
(default: retry indefinitely)\n\
-R, --retry-pause=N time to pause between retries, in seconds (default: 30)\n\
Expand Down Expand Up @@ -666,13 +665,13 @@ static void stratum_gen_work(struct stratum_ctx *sctx, struct work *work)
if (opt_algo == ALGO_HEAVY)
heavycoin_hash(merkle_root, sctx->job.coinbase, (int)sctx->job.coinbase_size);
else
sha256d(merkle_root, sctx->job.coinbase, (int)sctx->job.coinbase_size);
fugue256_hash(merkle_root, sctx->job.coinbase, (int)sctx->job.coinbase_size);
for (i = 0; i < sctx->job.merkle_count; i++) {
memcpy(merkle_root + 32, sctx->job.merkle[i], 32);
if (opt_algo == ALGO_HEAVY)
heavycoin_hash(merkle_root, merkle_root, 64);
else
sha256d(merkle_root, merkle_root, 64);
fugue256_hash(merkle_root, merkle_root, 64);
}

/* Increment extranonce2 */
Expand Down Expand Up @@ -811,6 +810,7 @@ static void *miner_thread(void *userdata)

/* scan nonces for a proof-of-work hash */
switch (opt_algo) {
/*
case ALGO_SCRYPT:
rc = scanhash_scrypt(thr_id, work.data, scratchbuf, work.target,
max_nonce, &hashes_done);
Expand All @@ -820,7 +820,7 @@ static void *miner_thread(void *userdata)
rc = scanhash_sha256d(thr_id, work.data, work.target,
max_nonce, &hashes_done);
break;

*/
case ALGO_HEAVY:
rc = scanhash_heavy(thr_id, work.data, work.target,
max_nonce, &hashes_done, work.maxvote);
Expand Down
8 changes: 8 additions & 0 deletions fuguecoin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,11 @@ extern "C" int scanhash_fugue256(int thr_id, uint32_t *pdata, const uint32_t *pt
*hashes_done = pdata[19] - start_nonce + 1;
return 0;
}

void fugue256_hash(unsigned char* output, const unsigned char* input, int len)
{
sph_fugue256_context ctx;
sph_fugue256_init(&ctx);
sph_fugue256(&ctx, input, len);
sph_fugue256_close(&ctx, (void *)output);
}
1 change: 1 addition & 0 deletions miner.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ extern int scanhash_fugue256(int thr_id, uint32_t *pdata,
const uint32_t *ptarget, uint32_t max_nonce,
unsigned long *hashes_done);

extern void fugue256_hash(unsigned char* output, const unsigned char* input, int len);
extern void heavycoin_hash(unsigned char* output, const unsigned char* input, int len);

struct thr_info {
Expand Down

0 comments on commit f67ee69

Please sign in to comment.