Browse Source

Merge branch 'master' of https://github.com/jackjack-jj/vanitygen

Conflicts:
	oclvanitygen.c
master
samr7 13 years ago
parent
commit
c6a0fb7611
  1. 8
      oclvanitygen.c
  2. 7
      vanitygen.c

8
oclvanitygen.c

@ -1959,6 +1959,7 @@ usage(const char *name)
"-k Keep pattern and continue search after finding a match\n" "-k Keep pattern and continue search after finding a match\n"
"-N Generate namecoin address\n" "-N Generate namecoin address\n"
"-T Generate bitcoin testnet address\n" "-T Generate bitcoin testnet address\n"
"-X <version> Generate address with the given version\n"
"-p <platform> Select OpenCL platform\n" "-p <platform> Select OpenCL platform\n"
"-d <device> Select OpenCL device\n" "-d <device> Select OpenCL device\n"
"-w <worksize> Set target thread count per multiprocessor\n" "-w <worksize> Set target thread count per multiprocessor\n"
@ -1994,7 +1995,8 @@ main(int argc, char **argv)
cl_device_id did; cl_device_id did;
const char *result_file = NULL; const char *result_file = NULL;
while ((opt = getopt(argc, argv, "vqrikNTp:d:w:g:b:Sh?f:o:s:")) != -1) { while ((opt = getopt(argc, argv,
"vqrikNTX:p:d:w:g:b:Sh?f:o:s:")) != -1) {
switch (opt) { switch (opt) {
case 'v': case 'v':
verbose = 2; verbose = 2;
@ -2019,6 +2021,10 @@ main(int argc, char **argv)
addrtype = 111; addrtype = 111;
privtype = 239; privtype = 239;
break; break;
case 'X':
addrtype = atoi(optarg);
privtype = 128 + addrtype;
break;
case 'p': case 'p':
platformidx = atoi(optarg); platformidx = atoi(optarg);
break; break;

7
vanitygen.c

@ -447,6 +447,7 @@ usage(const char *name)
"-k Keep pattern and continue search after finding a match\n" "-k Keep pattern and continue search after finding a match\n"
"-N Generate namecoin address\n" "-N Generate namecoin address\n"
"-T Generate bitcoin testnet address\n" "-T Generate bitcoin testnet address\n"
"-X <version> Generate address with the given version\n"
"-t <threads> Set number of worker threads (Default: number of CPUs)\n" "-t <threads> Set number of worker threads (Default: number of CPUs)\n"
"-f <file> File containing list of patterns, one per line\n" "-f <file> File containing list of patterns, one per line\n"
" (Use \"-\" as the file name for stdin)\n" " (Use \"-\" as the file name for stdin)\n"
@ -473,7 +474,7 @@ main(int argc, char **argv)
int nthreads = 0; int nthreads = 0;
vg_context_t *vcp = NULL; vg_context_t *vcp = NULL;
while ((opt = getopt(argc, argv, "vqrikNTt:h?f:o:s:")) != -1) { while ((opt = getopt(argc, argv, "vqrikNTX:t:h?f:o:s:")) != -1) {
switch (opt) { switch (opt) {
case 'v': case 'v':
verbose = 2; verbose = 2;
@ -498,6 +499,10 @@ main(int argc, char **argv)
addrtype = 111; addrtype = 111;
privtype = 239; privtype = 239;
break; break;
case 'X':
addrtype = atoi(optarg);
privtype = 128 + addrtype;
break;
case 't': case 't':
nthreads = atoi(optarg); nthreads = atoi(optarg);
if (nthreads == 0) { if (nthreads == 0) {

Loading…
Cancel
Save