0.5.7 - minor improvements

PawelGorny · Dec 16, 2021 · b9a9fd5 · b9a9fd5
1 parent c4c02d7
commit b9a9fd5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.pawelgorny</groupId>
     <artifactId>wifSolver</artifactId>
-    <version>0.5.6</version>
+    <version>0.5.7</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -18,17 +18,12 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>30.0-jre</version>
+            <version>31.0.1-jre</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.26</version>
-        </dependency>
-        <dependency>
-            <groupId>org.web3j</groupId>
-            <artifactId>crypto</artifactId>
-            <version>3.3.1</version>
+            <version>1.7.32</version>
         </dependency>
         <dependency>
             <groupId>javax.mail</groupId>

diff --git a/src/main/java/com/pawelgorny/wifsolver/Worker.java b/src/main/java/com/pawelgorny/wifsolver/Worker.java
@@ -127,26 +127,27 @@ protected String workThread(String suspect){
             if (configuration.getAddress() != null) {
                 if (Arrays.equals(configuration.getAddressHash(), ecKey.getPubKeyHash())) {
                     Address foundAddress = LegacyAddress.fromKey(Configuration.getNetworkParameters(), ecKey);
-                    String data = suspect + " -> " + foundAddress.toString();
+                    String data = suspect + " -> " + foundAddress.toString() + " [" + ecKey.getPrivateKeyAsHex() + "]";
                     if (DUMMY_CHECKSUM) {
                         suspect = rewriteWIF(suspect);
                     }
                     addResult(data);
                     System.out.println(data);
                     return suspect;
                 }
-                if (!configuration.getWork().equals(WORK.END)) {
+                if (!WORK.END.equals(configuration.getWork())) {
                     Address foundAddress = LegacyAddress.fromKey(Configuration.getNetworkParameters(), ecKey);
-                    String data = suspect + " -> " + foundAddress.toString();
+                    String data = suspect + " -> " + foundAddress.toString() + " [" + ecKey.getPrivateKeyAsHex() + "]";
                     addResult(data);
                     System.out.println(data);
+                    resultToFilePartial(data);
                 }
             } else {
                 Address foundAddress = LegacyAddress.fromKey(Configuration.getNetworkParameters(), ecKey);
                 if (DUMMY_CHECKSUM) {
                     suspect = rewriteWIF(suspect);
                 }
-                String data = suspect + " -> " + foundAddress.toString();
+                String data = suspect + " -> " + foundAddress.toString() + " [" + ecKey.getPrivateKeyAsHex() + "]";
                 addResult(data);
                 System.out.println(data);
                 resultToFilePartial(data);