feat: add authority status fields to abstractState

LimeChain · Jan 27, 2025 · 4702387 · 4702387
1 parent 78eedf8
commit 4702387
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 25 deletions.
diff --git a/src/main/java/com/limechain/client/NodeRoleManager.java b/src/main/java/com/limechain/client/NodeRoleManager.java
diff --git a/src/main/java/com/limechain/grandpa/state/GrandpaSetState.java b/src/main/java/com/limechain/grandpa/state/GrandpaSetState.java
@@ -27,13 +27,15 @@
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import lombok.extern.java.Log;
+import org.javatuples.Pair;
 import org.springframework.stereotype.Component;
 
 import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.PriorityQueue;
 import java.util.logging.Level;
 
@@ -176,6 +178,8 @@ public void startNewSet(List<Authority> authorities) {
 
         roundCache.addRound(setId, grandpaRound);
 
+        updateAuthorityStatus();
+
         log.log(Level.INFO, "Successfully transitioned to authority set id: " + setId);
     }
 
@@ -259,8 +263,13 @@ public void handleVoteMessage(VoteMessage voteMessage) {
         }
     }
 
-    public boolean participatesAsVoter() {
-        return authorities.stream()
-                .anyMatch(a -> keyStore.getKeyPair(KeyType.GRANDPA, a.getPublicKey()).isPresent());
+    private void updateAuthorityStatus() {
+        Optional<Pair<byte[], byte[]>> keyPair = authorities.stream()
+                .map(a -> keyStore.getKeyPair(KeyType.GRANDPA, a.getPublicKey()))
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .findFirst();
+
+        keyPair.ifPresentOrElse(AbstractState::setAuthorityStatus, AbstractState::unsetAuthorityStatus);
     }
 }
diff --git a/src/main/java/com/limechain/state/AbstractState.java b/src/main/java/com/limechain/state/AbstractState.java
@@ -3,13 +3,19 @@
 import com.limechain.ServiceState;
 import com.limechain.sync.SyncMode;
 import lombok.Getter;
+import org.javatuples.Pair;
 
 public abstract class AbstractState implements ServiceState {
 
+    @Getter
+    protected boolean initialized;
+
     @Getter
     private static SyncMode syncMode;
     @Getter
-    protected boolean initialized;
+    private static boolean isActiveAuthority = false;
+    @Getter
+    private static Pair<byte[], byte[]> grandpaKeyPair = null;
 
     public static void setSyncMode(SyncMode mode) {
         if (syncMode != null && syncMode.ordinal() > mode.ordinal()) {
@@ -19,6 +25,16 @@ public static void setSyncMode(SyncMode mode) {
         syncMode = mode;
     }
 
+    public static void setAuthorityStatus(Pair<byte[], byte[]> keyPair) {
+        isActiveAuthority = true;
+        grandpaKeyPair = keyPair;
+    }
+
+    public static void unsetAuthorityStatus() {
+        isActiveAuthority = false;
+        grandpaKeyPair = null;
+    }
+
     @Override
     public void initialize() {
         initialized = true;

diff --git a/src/main/java/com/limechain/sync/warpsync/WarpSyncState.java b/src/main/java/com/limechain/sync/warpsync/WarpSyncState.java
@@ -20,6 +20,7 @@
 import com.limechain.network.protocol.warp.scale.reader.JustificationReader;
 import com.limechain.runtime.Runtime;
 import com.limechain.runtime.RuntimeBuilder;
+import com.limechain.state.AbstractState;
 import com.limechain.state.StateManager;
 import com.limechain.storage.DBConstants;
 import com.limechain.storage.KVRepository;
@@ -148,7 +149,7 @@ public synchronized void syncCommit(CommitMessage commitMessage, PeerId peerId)
                 .getRound(commitMessage.getSetId(), commitMessage.getRoundNumber())
                 .addCommitMessageToArchive(commitMessage);
 
-        if (warpSyncFinished && !grandpaSetState.participatesAsVoter()) {
+        if (warpSyncFinished && !AbstractState.isActiveAuthority()) {
             updateState(commitMessage);
         }
     }