Fix sealed mining Block overwritten

aionnetwork · Sep 10, 2020 · ed30290 · ed30290
1 parent 6b66b7a
commit ed30290
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/modAionImpl/src/org/aion/zero/impl/types/AionBlock.java b/modAionImpl/src/org/aion/zero/impl/types/AionBlock.java
@@ -456,4 +456,8 @@ public void updateHeaderDifficulty(byte[] diff) {
                 .withDifficulty(diff)
                 .build();
     }
+
+    public boolean notSealed() {
+        return Arrays.equals(header.getSolution(), new byte[A0BlockHeader.SOLUTIONSIZE]) && Arrays.equals(header.getNonce(), ByteUtil.EMPTY_WORD);
+    }
 }
diff --git a/modApiServer/src/org/aion/api/server/rpc/ApiWeb3Aion.java b/modApiServer/src/org/aion/api/server/rpc/ApiWeb3Aion.java
@@ -2612,7 +2612,7 @@ public RpcMsg stratum_submitblock(Object _params) {
                 && !JSONObject.NULL.equals(hdrHash)) {
             // Grab copy of best block
             AionBlock bestBlock = ac.getBlockchain().getCachingMiningBlockTemplate(hexStringToBytes((String) hdrHash));
-            if (bestBlock != null) {
+            if (bestBlock != null && bestBlock.notSealed()) {
                 try {
                     bestBlock.seal(hexStringToBytes(nce + ""), hexStringToBytes(soln + ""));
                 } catch (Exception e) {