Merged dev into current branch

LimeChain · Sep 10, 2024 · 9fc4dcf · 9fc4dcf
2 parents 3d5b1d7 + 40ef3ab
commit 9fc4dcf
Show file tree

Hide file tree

Showing 33 changed files with 349 additions and 629 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,4 +25,5 @@ out/
 /test
 
 ### Local Chain Spec
-/src/main/webapp/genesis/westend-local.json
+/src/main/webapp/genesis/westend-local.json
+.smarttomcat/
diff --git a/src/main/java/com/limechain/Main.java b/src/main/java/com/limechain/Main.java
@@ -2,7 +2,7 @@
 
 import com.limechain.client.HostNode;
 import com.limechain.client.LightClient;
-import com.limechain.rpc.Function;
+import com.limechain.rpc.RPCFunction;
 import com.limechain.rpc.RpcClient;
 import com.limechain.rpc.server.RpcApp;
 import com.limechain.utils.DivLogger;
@@ -34,5 +34,5 @@ public static void main(String[] args) {
 
     @JSBody(params = {"f", "apiName"}, script = "window[apiName] = f;" +
         "window.fruzhin.HTTP.changeRpcExported(true);")
-    private static native void exportAPI(Function f, JSString apiName);
+    private static native void exportAPI(RPCFunction f, JSString apiName);
 }
diff --git a/src/main/java/com/limechain/chain/lightsyncstate/AuthoritySet.java b/src/main/java/com/limechain/chain/lightsyncstate/AuthoritySet.java
@@ -1,9 +1,9 @@
 package com.limechain.chain.lightsyncstate;
 
 import com.limechain.polkaj.Hash256;
+import com.limechain.tuple.Pair;
 import lombok.Getter;
 import lombok.Setter;
-import com.limechain.tuple.Pair;
 import lombok.ToString;
 
 import java.math.BigInteger;

diff --git a/src/main/java/com/limechain/chain/lightsyncstate/BabeEpoch.java b/src/main/java/com/limechain/chain/lightsyncstate/BabeEpoch.java
@@ -1,8 +1,8 @@
 package com.limechain.chain.lightsyncstate;
 
+import com.limechain.tuple.Pair;
 import lombok.Getter;
 import lombok.Setter;
-import com.limechain.tuple.Pair;
 
 import java.math.BigInteger;
 import java.util.List;

diff --git a/src/main/java/com/limechain/chain/lightsyncstate/EpochChanges.java b/src/main/java/com/limechain/chain/lightsyncstate/EpochChanges.java
@@ -1,9 +1,9 @@
 package com.limechain.chain.lightsyncstate;
 
 import com.limechain.polkaj.Hash256;
+import com.limechain.tuple.Pair;
 import lombok.Getter;
 import lombok.Setter;
-import com.limechain.tuple.Pair;
 import lombok.ToString;
 
 import java.math.BigInteger;

diff --git a/src/main/java/com/limechain/network/Network.java b/src/main/java/com/limechain/network/Network.java
@@ -1,9 +1,9 @@
 package com.limechain.network;
 
-import com.limechain.chain.Chain;
 import com.limechain.chain.ChainService;
-import com.limechain.config.HostConfig;
 import com.limechain.network.kad.KademliaService;
+import com.limechain.network.protocol.blockannounce.BlockAnnounceService;
+import com.limechain.network.protocol.grandpa.GrandpaService;
 import com.limechain.network.protocol.warp.WarpSyncService;
 import com.limechain.network.protocol.warp.dto.WarpSyncResponse;
 import com.limechain.rpc.server.AppBean;
@@ -14,23 +14,21 @@
 import java.util.Random;
 import java.util.logging.Level;
 
-import static com.limechain.network.kad.KademliaService.REPLICATION;
-
 /**
  * A Network class that handles all peer connections and Kademlia
  */
 @Log
 public class Network {
     private static final Random RANDOM = new Random();
     @Getter
-    private final Chain chain;
-    @Getter
     private final String[] bootNodes;
     //    private final ConnectionManager connectionManager;
     @Getter
     private KademliaService kademliaService;
+    private WarpSyncService warpSyncService;
+    private GrandpaService grandpaService;
+    private BlockAnnounceService blockAnnounceService;
     private boolean started = false;
-    private int bootPeerIndex = 0;
 
     /**
      * Initializes a host for the peer connection,
@@ -39,30 +37,26 @@ public class Network {
      * Connects Kademlia to boot nodes
      *
      * @param chainService chain specification information containing boot nodes
-     * @param hostConfig   host configuration containing current network
      */
-    public Network(ChainService chainService, HostConfig hostConfig) {
+    public Network(ChainService chainService) {
         this.bootNodes = chainService.getChainSpec().getBootNodes();
-        this.chain = hostConfig.getChain();
 //        this.connectionManager = ConnectionManager.getInstance();
-        this.initializeProtocols(chainService, hostConfig);
+        this.initializeProtocols(chainService);
     }
 
-    private void initializeProtocols(ChainService chainService,
-                                     HostConfig hostConfig) {
+    private void initializeProtocols(ChainService chainService) {
 
-//
         String chainId = chainService.getChainSpec().getProtocolId();
         String warpProtocolId = ProtocolUtils.getWarpSyncProtocol(chainId);
-//        String lightProtocolId = ProtocolUtils.getLightMessageProtocol(chainId);
-//        String blockAnnounceProtocolId = ProtocolUtils.getBlockAnnounceProtocol(chainId);
-//        String grandpaProtocolId = ProtocolUtils.getGrandpaProtocol(chainId);
+        String blockAnnounceProtocolId = ProtocolUtils.getBlockAnnounceProtocol(chainId);
+        String grandpaProtocolId = ProtocolUtils.getGrandpaProtocol();
 
         kademliaService = new KademliaService();
         warpSyncService = new WarpSyncService(warpProtocolId);
-    }
+        blockAnnounceService = new BlockAnnounceService(blockAnnounceProtocolId);
+        grandpaService = new GrandpaService(grandpaProtocolId);
 
-    WarpSyncService warpSyncService;
+    }
 
 //    private Ed25519PrivateKey loadPrivateKeyFromDB(KVRepository<String, Object> repository) {
 //        Ed25519PrivateKey privateKey;
@@ -95,43 +89,10 @@ public void stop() {
         log.log(Level.INFO, "Stopped network module!");
     }
 
-    public boolean updateCurrentSelectedPeerWithNextBootnode() {
-//        if (bootPeerIndex > kademliaService.getBootNodePeerIds().size())
-//            return false;
-//        this.currentSelectedPeer = this.kademliaService.getBootNodePeerIds().get(bootPeerIndex);
-        bootPeerIndex++;
-        return true;
-    }
-
-    public boolean updateCurrentSelectedPeerWithBootnode(int index) {
-//        if (index >= 0 && index < this.kademliaService.getBootNodePeerIds().size()) {
-//            this.currentSelectedPeer = this.kademliaService.getBootNodePeerIds().get(index);
-//            return true;
-//        }
-        return false;
-    }
-
     public void updateCurrentSelectedPeer() {
-//        if (connectionManager.getPeerIds().isEmpty()) return;
-//        this.currentSelectedPeer = connectionManager.getPeerIds().stream()
-//                .skip(RANDOM.nextInt(connectionManager.getPeerIds().size())).findAny().orElse(null);
         kademliaService.updateSuccessfulBootNodes();
     }
 
-//    public String getPeerId() {
-//        return this.host.getPeerId().toString();
-//    }
-
-    public String[] getListenAddresses() {
-        // TODO Bug: .listenAddresses() returns empty list
-//        return this.host.listenAddresses().stream().map(Multiaddr::toString).toArray(String[]::new);
-        return null;
-    }
-
-    public int getPeersCount() {
-        return 0;//connectionManager.getPeerIds().size();
-    }
-
     /**
      * Periodically searches for new peers and connects to them
      * Logs the number of connected peers excluding boot nodes
@@ -142,31 +103,11 @@ public void findPeers() {
         if (!started) {
             return;
         }
-        if (getPeersCount() >= REPLICATION) {
-            log.log(Level.INFO,
-                    "Connections have reached replication factor(" + REPLICATION + "). " +
-                    "No need to search for new ones yet.");
-            return;
-        }
-
-        log.log(Level.INFO, "Searching for peers...");
         kademliaService.findNewPeers();
-
-//        if (this.currentSelectedPeer == null) {
-//            updateCurrentSelectedPeer();
-//        }
-
-        log.log(Level.INFO, String.format("Connected peers: %s", getPeersCount()));
     }
 
     //    @Scheduled(fixedDelay = 1, timeUnit = TimeUnit.MINUTES)
     public void pingPeers() {
-        // TODO: This needs to by synchronized with the findPeers method
-        if (getPeersCount() == 0) {
-            log.log(Level.INFO, "No peers to ping.");
-            return;
-        }
-
         log.log(Level.INFO, "Pinging peers...");
 //        connectionManager.getPeerIds().forEach(this::ping);
     }
@@ -212,7 +153,8 @@ public WarpSyncResponse makeWarpSyncRequest(String blockHash) {
         return this.warpSyncService.getProtocol().warpSyncRequest(
                 blockHash);
     }
-//
+
+    //
 //    public LightClientMessage.Response makeRemoteReadRequest(String blockHash, String[] keys) {
 //        if (isPeerInvalid()) return null;
 //
@@ -237,31 +179,18 @@ public WarpSyncResponse makeWarpSyncRequest(String blockHash) {
 //        return false;
 //    }
 //
-//    public void handshakeBootNodes() {
-//        kademliaService.getBootNodePeerIds()
-//                .stream()
-//                .distinct()
-//                .forEach(this::sendGrandpaHandshake);
-//    }
-//
-//    private void sendGrandpaHandshake(PeerId peerId) {
-//        //TODO:
-//        // when using threads we connect to more than 10 peers, but have some unhandled exceptions,
-//        // without them we connect to only 2 peers
-//        new Thread(() ->
-//                blockAnnounceService.sendHandshake(this.host, this.host.getAddressBook(), peerId)
-//        ).start();
-//    }
+
+    public void sendBlockAnnounceHandshake() {
+        new Thread(() ->
+                blockAnnounceService.sendHandshake()
+        ).start();
+    }
 
     //    @Scheduled(fixedRate = 5, initialDelay = 5, timeUnit = TimeUnit.MINUTES)
     public void sendNeighbourMessages() {
         if (!AppBean.getBean(WarpSyncState.class).isWarpSyncFinished()) {
             return;
         }
-//        connectionManager.getPeerIds().forEach(peerId -> grandpaService.sendNeighbourMessage(this.host, peerId));
+        grandpaService.sendHandshake();
     }
-//
-//    public void sendNeighbourMessage(PeerId peerId) {
-//        grandpaService.sendNeighbourMessage(this.host, peerId);
-//    }
 }
diff --git a/src/main/java/com/limechain/network/ProtocolUtils.java b/src/main/java/com/limechain/network/ProtocolUtils.java
@@ -7,22 +7,10 @@
 public final class ProtocolUtils {
     public static final String PING_PROTOCOL = "/ipfs/ping/1.0.0";
 
-    public static String getLightMessageProtocol(String chainId) {
-        return String.format("/%s/light/2", chainId);
-    }
-
     public static String getWarpSyncProtocol(String chainId) {
         return String.format("/%s/sync/warp", chainId);
     }
 
-    public static String getSyncProtocol(String chainId) {
-        return String.format("/%s/sync/2", chainId);
-    }
-
-    public static String getStateProtocol(String chainId) {
-        return String.format("/%s/state/2", chainId);
-    }
-
     public static String getBlockAnnounceProtocol(String chainId) {
         return String.format("/%s/block-announces/1", chainId);
     }
@@ -31,16 +19,8 @@ public static String getKadProtocol(String chainId) {
         return String.format("/%s/kad", chainId);
     }
 
-    public static String getGrandpaProtocol(String chainId) {
-        return String.format("/%s/grandpa/1", grandpaProtocolChain(chainId));
-    }
-
-    //TODO: figure out a more elegant solution
-    private static String grandpaProtocolChain(String chainId) {
-        return chainId.equals("dot") ? "paritytech" : chainId;
+    public static String getGrandpaProtocol() {
+        return "/paritytech/grandpa/1";
     }
 
-    public static String getTransactionsProtocol(String chainId) {
-        return String.format("/%s/transactions/1", chainId);
-    }
 }
diff --git a/src/main/java/com/limechain/network/kad/KademliaService.java b/src/main/java/com/limechain/network/kad/KademliaService.java
@@ -6,14 +6,8 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.java.Log;
-import org.teavm.interop.Async;
-import org.teavm.interop.AsyncCallback;
 import org.teavm.jso.JSBody;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Random;
-import java.util.concurrent.ExecutionException;
 import java.util.logging.Level;
 
 /**

diff --git a/src/main/java/com/limechain/network/protocol/blockannounce/BlockAnnounce.java b/src/main/java/com/limechain/network/protocol/blockannounce/BlockAnnounce.java
diff --git a/src/main/java/com/limechain/network/protocol/blockannounce/BlockAnnounceController.java b/src/main/java/com/limechain/network/protocol/blockannounce/BlockAnnounceController.java