Adding PoC+ support.

Author: jjos2372

build.gradle

@@ -36,8 +36,8 @@ def dbusername = "root"
 dependencies {
     implementation 'org.apache.poi:poi-ooxml:4.1.0'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.10'
-    // implementation 'com.github.burst-apps-team:burstkit4j:0.15.1'
-    implementation 'com.github.jjos2372:burstkit4j:35fbdae491'
+    implementation 'com.github.burst-apps-team:burstkit4j:8846b302ea'
+    //implementation 'com.github.jjos2372:burstkit4j:35fbdae491'
     implementation 'org.nanohttpd:nanohttpd:2.3.1'
     implementation "org.flywaydb:flyway-core:6.5.0"
     implementation "com.h2database:h2:1.4.199"

dist/pool.properties

@@ -47,6 +47,9 @@ maxDeadline = 1000000000
 # short lived network forks.
 processLag = 10
 
+# The block to activate PoC+
+pocPlusBlock = 271000
+
 # Recipient of pool fees
 feeRecipient=BURST-W5YR-ZZQC-KUBJ-G78KB
 # Percentage of each block reward taken by pool (1 = 100%)

src/main/java/burst/pool/miners/Miner.java

@@ -17,6 +17,8 @@ public class Miner implements Payable {
 
     private final BurstAddress address;
     private final MinerStore store;
+    private int commitmentHeight;
+    private AtomicReference<BurstValue> commitment = new AtomicReference<>();
 
     public Miner(MinerMaths minerMaths, PropertyService propertyService, BurstAddress address, MinerStore store) {
         this.minerMaths = minerMaths;
@@ -156,7 +158,23 @@ public String getName() {
     public void setName(String name) {
         store.setName(name);
     }
-
+    
+    public void setCommitment(BurstValue commitment, int height) {
+        this.commitment.set(commitment);
+        this.commitmentHeight = height;
+    }
+    
+    public BurstValue getCommitment() {
+        BurstValue value = commitment.get();
+        if(value == null)
+            value = BurstValue.fromBurst(0);
+        return value;
+    }
+    
+    public int getCommitmentHeight() {
+        return this.commitmentHeight;
+    }
+    
     public String getUserAgent() {
         return store.getUserAgent();
     }

src/main/java/burst/pool/miners/MinerTracker.java

@@ -5,6 +5,7 @@
 import burst.kit.entity.BurstID;
 import burst.kit.entity.BurstValue;
 import burst.kit.entity.response.Account;
+import burst.kit.entity.response.MiningInfo;
 import burst.kit.service.BurstNodeService;
 import burst.pool.entity.Payout;
 import burst.pool.entity.WonBlock;
@@ -39,12 +40,38 @@ public MinerTracker(BurstNodeService nodeService, PropertyService propertyServic
         this.propertyService = propertyService;
     }
 
-    public void onMinerSubmittedDeadline(StorageService storageService, BurstAddress minerAddress, BigInteger deadline, BigInteger baseTarget, long blockHeight, String userAgent) {
+    public void onMinerSubmittedDeadline(StorageService storageService, BurstAddress minerAddress, BigInteger deadline, BigInteger baseTarget, MiningInfo miningInfo, String userAgent) {
         waitUntilNotProcessingBlock();
         Miner miner = getOrCreate(storageService, minerAddress);
+        
+        int blockHeight = (int) miningInfo.getHeight();
+        
+        if(miner.getCommitmentHeight() != blockHeight) {
+            miner.setUserAgent(userAgent);
+            try {
+                Account accountResponse = nodeService.getAccount(minerAddress, blockHeight, true).blockingGet();
+                onMinerAccount(storageService, accountResponse, blockHeight);                
+            }
+            catch (Exception e) {
+                miner.setCommitment(null, blockHeight);
+                onMinerAccountError(e);
+            }
+        }
+        
+        if(blockHeight >= propertyService.getInt(Props.pocPlusBlock)) {
+            // PoC+ logic
+            BurstValue commitment = miner.getCommitment();
+            
+            double commitmentFactor = commitment.doubleValue()/miningInfo.getAverageCommitment();
+            commitmentFactor = Math.pow(commitmentFactor, 0.4515449935);
+            commitmentFactor = Math.min(8.0, commitmentFactor);
+            commitmentFactor = Math.max(0.125, commitmentFactor);
+            
+            double newDeadline = deadline.longValue()/commitmentFactor;
+            
+            deadline = BigInteger.valueOf((long)newDeadline);
+        }
         miner.processNewDeadline(new Deadline(deadline, baseTarget, miner.getSharePercent(), blockHeight));
-        miner.setUserAgent(userAgent);
-        compositeDisposable.add(nodeService.getAccount(minerAddress).subscribe(accountResponse -> onMinerAccount(storageService, accountResponse), this::onMinerAccountError));
     }
 
     private Miner getOrCreate(StorageService storageService, BurstAddress minerAddress) {
@@ -220,12 +247,13 @@ private void onPayoutError(Throwable throwable) {
     }
 
 
-    private void onMinerAccount(StorageService storageService, Account accountResponse) {
+    private void onMinerAccount(StorageService storageService, Account accountResponse, int height) {
         waitUntilNotProcessingBlock();
         Miner miner = storageService.getMiner(accountResponse.getId());
         if (miner == null) return;
         if (accountResponse.getName() == null) return;
         miner.setName(accountResponse.getName());
+        miner.setCommitment(accountResponse.getCommitment(), height);
     }
 
     private void onMinerAccountError(Throwable throwable) {

src/main/java/burst/pool/pool/Pool.java

@@ -313,7 +313,7 @@ private void resetRound(MiningInfo newMiningInfo) {
                 if(miningInfo.get()!=null) {
                     long mod = miningInfo.get().getHeight() % (transferBlocks);
                     if(mod == 0L) {
-                        Account balance = nodeService.getAccount(secondaryAddress).blockingGet();
+                        Account balance = nodeService.getAccount(secondaryAddress, null, null).blockingGet();
                         if(balance.getBalance().compareTo(BurstValue.fromBurst(propertyService.getFloat(Props.minimumMinimumPayout))) > 0) {
                             BurstValue amountToSend = balance.getBalance().subtract(getTransactionFee());
                             byte[] unsignedBytes = nodeService.generateTransaction(primaryAddress, burstCrypto.getPublicKey(passphrase), amountToSend,
@@ -392,7 +392,7 @@ BigInteger checkNewSubmission(Submission submission, String userAgent) throws Su
                 onNewBestDeadline(miningInfo.get().getHeight(), submission, deadline);
             }
 
-            minerTracker.onMinerSubmittedDeadline(storageService, submission.getMiner(), deadline, BigInteger.valueOf(miningInfo.get().getBaseTarget()), miningInfo.get().getHeight(), userAgent);
+            minerTracker.onMinerSubmittedDeadline(storageService, submission.getMiner(), deadline, BigInteger.valueOf(miningInfo.get().getBaseTarget()), miningInfo.get(), userAgent);
             return deadline;
         } finally {
             processDeadlineSemaphore.release();
@@ -466,7 +466,7 @@ public JsonObject getCurrentRoundInfo(Gson gson) {
         if (miningInfo != null) {
             long baseTarget = miningInfo.getBaseTarget();
             baseTarget = (long)(baseTarget * 1.83f);
-            jsonObject.add("miningInfo", gson.toJsonTree(new MiningInfoResponse(burstCrypto.toHexString(miningInfo.getGenerationSignature()), baseTarget, miningInfo.getHeight())));
+            jsonObject.add("miningInfo", gson.toJsonTree(new MiningInfoResponse(burstCrypto.toHexString(miningInfo.getGenerationSignature()), baseTarget, miningInfo.getHeight(), miningInfo.getAverageCommitment())));
         }
         return jsonObject;
     }

src/main/java/burst/pool/pool/Server.java

@@ -116,7 +116,7 @@ private String handleBurstApiCall(IHTTPSession session, Map<String, String> para
         } else if (Objects.equals(params.get("requestType"), "getMiningInfo")) {
             MiningInfo miningInfo = pool.getMiningInfo();
             if (miningInfo == null) return gson.toJson(JsonNull.INSTANCE);
-            return gson.toJson(new MiningInfoResponse(burstCrypto.toHexString(miningInfo.getGenerationSignature()), miningInfo.getBaseTarget(), miningInfo.getHeight()));
+            return gson.toJson(new MiningInfoResponse(burstCrypto.toHexString(miningInfo.getGenerationSignature()), miningInfo.getBaseTarget(), miningInfo.getHeight(), miningInfo.getAverageCommitment()));
         } else {
             return "404 not found";
         }

src/main/java/burst/pool/storage/config/Props.java

@@ -25,6 +25,7 @@ public class Props {
     public static final Prop<Integer> nMin = new Prop<>("nMin", 1); // Must be ?
     public static final Prop<Long> maxDeadline = new Prop<>("maxDeadline", Long.MAX_VALUE); // Must be > 0
     public static final Prop<Integer> processLag = new Prop<>("processLag", 10); // Must be > 0
+    public static final Prop<Integer> pocPlusBlock = new Prop<>("pocPlusBlock", 271_000);
 
     public static final Prop<BurstAddress> feeRecipient = new Prop<>("feeRecipient", null); // Must be non null
     public static final Prop<BurstAddress> donationRecipient = new Prop<>("donationRecipient", null); // Must be non null