Clear recent sealers on validator set change

icon-project · Sep 3, 2024 · f0e86f1 · f0e86f1
1 parent 8d736c5
commit f0e86f1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/bmv/bsc2/src/main/java/foundation/icon/btp/bmv/bsc2/EthAddresses.java b/bmv/bsc2/src/main/java/foundation/icon/btp/bmv/bsc2/EthAddresses.java
@@ -75,6 +75,10 @@ public int count(EthAddress cmp) {
         return cnt;
     }
 
+    public void clear() {
+        addresses.clear();
+    }
+
     @Override
     public String toString() {
         return "EthAddresses{" +

diff --git a/bmv/bsc2/src/main/java/foundation/icon/btp/bmv/bsc2/Snapshot.java b/bmv/bsc2/src/main/java/foundation/icon/btp/bmv/bsc2/Snapshot.java
@@ -124,17 +124,15 @@ public Snapshot apply(ChainConfig config, Header head) {
             newCurrTurnLength = nextTurnLength;
             newValidators = candidates;
 
-            // If the number of current validators is less than the number of previous validators,
-            // the capacity of the recent signers should be adjusted
-            int limit = Utils.calcMinerHistoryLength(newValidators.size(), newCurrTurnLength) + 1;
-            for (int i = 0; i < newRecents.size() - limit; i++) {
-                newRecents.remove(i);
-            }
-
             if (config.isBohr(head.getTime())) {
                 // BEP-404: Clear Miner History when switching validators set
-                for (int i = 0; i < newRecents.size(); i++) {
-                    newRecents.set(i, EthAddress.EMPTY);
+                newRecents.clear();
+            } else {
+                // If the number of current validators is less than the number of previous validators,
+                // the capacity of the recent signers should be adjusted
+                int limit = Utils.calcMinerHistoryLength(newValidators.size(), newCurrTurnLength) + 1;
+                for (int i = 0; i < newRecents.size() - limit; i++) {
+                    newRecents.remove(i);
                 }
             }
         }