Merge pull request #1 from koh-gt/uvg-r1

uvg-r1
koh-gt · Dec 22, 2023 · b85ceef · b85ceef
2 parents 482304f + 85032ec
commit b85ceef
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 43 deletions.
diff --git a/base58prefix.txt b/base58prefix.txt
@@ -1,9 +1,9 @@
-# For more infomation, please see https://en.bitcoin.it/wiki/List_of_address_prefixes
+# For more infomation, please visit https://en.bitcoin.it/wiki/List_of_address_prefixes
 # Please sort this file by `sort -k1.1,1.1 base58prefix.txt>base58prefix.new; mv base58prefix.new base58prefix.txt`
 # Symbol, Coin name, Address prefix, Address base58 version (prefix), Private key base58 version (prefix)
-DOGE,Dogecoin,D,30,158
-LTC,Litecoin,L,48,176
 NMC,Namecoin,M or N,52,180
+LTC,Litecoin,L,48,176
 CY,Cyberyen,C,28,156
+DOGE,Dogecoin,D,30,158
 FNNC,Fennec,F,35,178
 
diff --git a/keyconv/keyconv.c b/keyconv/keyconv.c
@@ -172,16 +172,9 @@ main(int argc, char **argv)
 					return 1;
 				}
 				if (strcmp(optarg, "GRS")== 0) {
-                    GRSFlag = 1;
-                }
-				else {
-				fprintf(stderr,
-						"No coin indicated.\nGenerating/Decrypting FEC [Ferritecoin] Address by default.\n");
-				addrtype_opt = 36;
-				privtype_opt = 36+127;
-				break;		
-
-				}
+		                    GRSFlag = 1;
+		                }
+
 			}
 			break;
 

diff --git a/oclvanitygen/oclvanitygen.c b/oclvanitygen/oclvanitygen.c
@@ -250,7 +250,7 @@ main(int argc, char **argv)
 				fprintf(stderr,
 						"Generating BTC [Bitcoin] Testnet Address\n");
 				addrtype = 111;
-				privtype = 239;
+				privtype = 111+128;
 				break;
 			}
 
@@ -263,23 +263,16 @@ main(int argc, char **argv)
 				break;
 			}
 			else {
-                // Read from base58prefix.txt
-                fprintf(stderr, "Generating %s Address\n", optarg);
-                if (vg_get_altcoin(optarg, &addrtype, &privtype)) {
-                    return 1;
-                }
-                if (strcmp(optarg, "GRS")== 0) {
-                    GRSFlag = 1;
-                }
-				else {
-				fprintf(stderr,
-						"No coin indicated.\nGenerating/Decrypting FEC [Ferritecoin] Address by default.\n");
-				addrtype = 36;
-				privtype = 36+127;
-				break;		
-
-				}
-            }
+		                // Read from base58prefix.txt
+		                fprintf(stderr, "Generating %s Address\n", optarg);
+		                if (vg_get_altcoin(optarg, &addrtype, &privtype)) {
+		                    return 1;
+		                }
+		                if (strcmp(optarg, "GRS")== 0) {
+		                    GRSFlag = 1;
+		                }
+
+           		 }
 			break;
 
 /*END ALTCOIN GENERATOR*/

diff --git a/vanitygen/vanitygen.c b/vanitygen/vanitygen.c
@@ -501,7 +501,7 @@ main(int argc, char **argv)
 				fprintf(stderr,
 						"Generating BTC [Bitcoin] Testnet Address\n");
 				addrtype = 111;
-				privtype = 239;
+				privtype = 111+128;
 				break;
 			}
 
@@ -527,17 +527,10 @@ main(int argc, char **argv)
 				if (vg_get_altcoin(optarg, &addrtype, &privtype)) {
 					return 1;
 				}
-                if (strcmp(optarg, "GRS")== 0) {
-                    GRSFlag = 1;
-                }
-				else {
-				fprintf(stderr,
-						"No coin indicated.\nGenerating/Decrypting FEC [Ferritecoin] Address by default.\n");
-				addrtype = 36;
-				privtype = 36+127;
-				break;		
-
-				}
+		                if (strcmp(optarg, "GRS")== 0) {
+		                    GRSFlag = 1;
+		                }
+
 			}
 			break;