- new version 0.4.7-SNAPSHOT

- removed optDevPool option
- limited number of parts per plotfile
- fixed amount of mem shown for openCl device
- cleanup and minor changes

jminer.default.properties

@@ -97,9 +97,6 @@ winnerRetryIntervalInMs=
 devPool=
 devPoolCommitsPerRound=
 
-# NOT WORKING?! Try, but i fear it will find no deadlines, yet.
-optDevPool=false
-
 # -----------------------------------------------------------------------------------
 # - MINING MODE - SOLO ---------------------------------- ONLY NEEDED 4 SOLO MINING -
 # -----------------------------------------------------------------------------------

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>burstcoin</groupId>
   <artifactId>burstcoin-jminer</artifactId>
-  <version>0.4.6-SNAPSHOT</version>
+  <version>0.4.7-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>burstcoin-jminer</name>

run.bat

@@ -1 +1 @@
-java -jar -d64 -XX:+UseG1GC burstcoin-jminer-0.4.6-SNAPSHOT.jar
+java -jar -d64 -XX:+UseG1GC burstcoin-jminer-0.4.7-SNAPSHOT.jar

src/main/java/burstcoin/jminer/JMinerCommandLine.java

@@ -85,7 +85,7 @@ public void run(String... args)
     LOG.info("            __         __   GPU assisted PoC-Miner");
     LOG.info("           |__| _____ |__| ____   ___________ ");
     LOG.info("   version |  |/     \\|  |/    \\_/ __ \\_  __ \\");
-    LOG.info("     0.4.6 |  |  Y Y  \\  |   |  \\  ___/|  | \\/");
+    LOG.info("     0.4.7 |  |  Y Y  \\  |   |  \\  ___/|  | \\/");
     LOG.info("       /\\__|  |__|_|  /__|___|  /\\___  >__| ");
     LOG.info("       \\______|     \\/        \\/     \\/");
     LOG.info("      mining engine: BURST-LUXE-RED2-G6JW-H4HG5");
@@ -193,9 +193,6 @@ public void onApplicationEvent(ReaderProgressChangedEvent event)
         {
           progressLogStep--;
 
-          // trigger garbage collection on every progress step
-          System.gc();
-
           BigDecimal totalCapacity = new BigDecimal(event.getCapacity());
           BigDecimal factor = BigDecimal.ONE.divide(totalCapacity, MathContext.DECIMAL32);
           BigDecimal progress = factor.multiply(new BigDecimal(event.getCapacity() - event.getRemainingCapacity()));

src/main/java/burstcoin/jminer/core/CoreProperties.java

@@ -66,10 +66,6 @@ public class CoreProperties
   private static final boolean DEFAULT_WRITE_LOG_FILE = false;
   private static final String DEFAULT_LOG_FILE_PATH = "log/jminer.log.txt";
 
-  // there seams to be a issue on checker
-  private static final boolean DEFAULT_OPT_DEV_POOL = false;
-
-
   static
   {
     try
@@ -89,7 +85,6 @@ public class CoreProperties
   private static Long winnerRetryIntervalInMs;
   private static Boolean scanPathsEveryRound;
   private static Integer devPoolCommitsPerRound;
-  private static Boolean optDevPool;
   private static Boolean devPool;
   private static Boolean poolMining;
   private static Long targetDeadline;
@@ -214,20 +209,6 @@ public static int getDevPoolCommitsPerRound()
     return devPoolCommitsPerRound;
   }
 
-  /**
-   * Is opt dev pool.
-   *
-   * @return the boolean
-   */
-  public static boolean isOptDevPool()
-  {
-    if(optDevPool == null)
-    {
-      optDevPool = asBoolean("optDevPool", DEFAULT_OPT_DEV_POOL);
-    }
-    return optDevPool;
-  }
-
   /**
    * Is dev pool.
    *

src/main/java/burstcoin/jminer/core/checker/Checker.java

@@ -22,8 +22,6 @@
 
 package burstcoin.jminer.core.checker;
 
-import burstcoin.jminer.core.CoreProperties;
-import burstcoin.jminer.core.checker.task.OCLCheckerFindAllBelowTargetTask;
 import burstcoin.jminer.core.checker.task.OCLCheckerTask;
 import burstcoin.jminer.core.reader.event.ReaderLoadedPartEvent;
 import org.slf4j.Logger;
@@ -35,8 +33,6 @@
 import org.springframework.core.task.SyncTaskExecutor;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-
 /**
  * The type Checker.
  */
@@ -47,46 +43,23 @@ public class Checker
 {
   private static final Logger LOG = LoggerFactory.getLogger(Checker.class);
 
-  @Autowired
-  private ApplicationContext context;
-
-  @Autowired
-  private SyncTaskExecutor checkTaskExecutor;
-
-  // setting
-  private boolean devPool;
-  private boolean optDevPool;
+  private final ApplicationContext context;
+  private final SyncTaskExecutor checkTaskExecutor;
 
   // data
   private long blockNumber;
-  private long targetDeadline;
-  private long baseTarget;
   private byte[] generationSignature;
 
-  /**
-   * Post construct.
-   */
-  @PostConstruct
-  protected void postConstruct()
+  @Autowired
+  public Checker(ApplicationContext context, SyncTaskExecutor checkTaskExecutor)
   {
-    this.devPool = CoreProperties.isDevPool();
-    this.optDevPool = CoreProperties.isOptDevPool();
-    this.targetDeadline = CoreProperties.getTargetDeadline();
+    this.context = context;
+    this.checkTaskExecutor = checkTaskExecutor;
   }
 
-  /**
-   * Reconfigure void.
-   *
-   * @param blockNumber the block number
-   * @param baseTarget the base target
-   * @param targetDeadline the target deadline
-   * @param generationSignature the generation signature
-   */
-  public void reconfigure(long blockNumber, long baseTarget, long targetDeadline, byte[] generationSignature)
+  public void reconfigure(long blockNumber, byte[] generationSignature)
   {
     this.blockNumber = blockNumber;
-    this.baseTarget = baseTarget;
-    this.targetDeadline = targetDeadline;
     this.generationSignature = generationSignature;
   }
 
@@ -96,20 +69,9 @@ public void handleMessage(ReaderLoadedPartEvent event)
   {
     if(blockNumber == event.getBlockNumber())
     {
-      if(devPool && optDevPool)
-      {
-        // todo findTartget() does not work! optDevPool not supported yet!
-        OCLCheckerFindAllBelowTargetTask oclCheckerFindAllBelowTargetTask = context.getBean(OCLCheckerFindAllBelowTargetTask.class);
-        oclCheckerFindAllBelowTargetTask.init(event.getBlockNumber(), generationSignature, event.getScoops(), targetDeadline,
-                                              event.getChunkPartStartNonce(), baseTarget);
-        checkTaskExecutor.execute(oclCheckerFindAllBelowTargetTask);
-      }
-      else
-      {
-        OCLCheckerTask oclCheckerTask = context.getBean(OCLCheckerTask.class);
-        oclCheckerTask.init(event.getBlockNumber(), generationSignature, event.getScoops(), event.getChunkPartStartNonce());
-        checkTaskExecutor.execute(oclCheckerTask);
-      }
+      OCLCheckerTask oclCheckerTask = context.getBean(OCLCheckerTask.class);
+      oclCheckerTask.init(event.getBlockNumber(), generationSignature, event.getScoops(), event.getChunkPartStartNonce());
+      checkTaskExecutor.execute(oclCheckerTask);
     }
     else
     {

src/main/java/burstcoin/jminer/core/checker/event/CheckerResultEvent.java

@@ -35,14 +35,6 @@ public class CheckerResultEvent
   private BigInteger nonce;
   private BigInteger result;
 
-  /**
-   * Instantiates a new Checker result event.
-   *
-   * @param blockNumber the block number
-   * @param chunkPartStartNonce the chunk part start nonce
-   * @param nonce the nonce
-   * @param result the result
-   */
   public CheckerResultEvent(long blockNumber, BigInteger chunkPartStartNonce, BigInteger nonce, BigInteger result)
   {
     this.chunkPartStartNonce = chunkPartStartNonce;
@@ -52,41 +44,21 @@ public CheckerResultEvent(long blockNumber, BigInteger chunkPartStartNonce, BigI
     this.result = result;
   }
 
-  /**
-   * Gets block number.
-   *
-   * @return the block number
-   */
   public long getBlockNumber()
   {
     return blockNumber;
   }
 
-  /**
-   * Gets nonce.
-   *
-   * @return the nonce
-   */
   public BigInteger getNonce()
   {
     return nonce;
   }
 
-  /**
-   * Gets result.
-   *
-   * @return the result
-   */
   public BigInteger getResult()
   {
     return result;
   }
 
-  /**
-   * Gets chunk part start nonce.
-   *
-   * @return the chunk part start nonce
-   */
   public BigInteger getChunkPartStartNonce()
   {
     return chunkPartStartNonce;