Merge remote-tracking branch 'origin/dev' into 519-support-more-rpc

LimeChain · Sep 19, 2024 · b265f5d · b265f5d
2 parents 87d5d16 + 36bb826
commit b265f5d
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 72 deletions.
diff --git a/src/main/java/com/limechain/network/kad/KademliaService.java b/src/main/java/com/limechain/network/kad/KademliaService.java
@@ -1,10 +1,7 @@
 package com.limechain.network.kad;
 
-import com.limechain.network.kad.dto.Host;
-import com.limechain.network.kad.dto.PeerId;
 import com.limechain.network.protocol.NetworkService;
 import lombok.Getter;
-import lombok.Setter;
 import lombok.extern.java.Log;
 import org.teavm.jso.JSBody;
 
@@ -18,8 +15,6 @@
 public class KademliaService extends NetworkService {
     public static final int REPLICATION = 20;
 
-    @Setter
-    private Host host;
     private int successfulBootNodes;
 
     /**
@@ -39,12 +34,6 @@ public int connectBootNodes(String[] bootNodes) {
             }
             peer = getPeerId();
         }
-        String peerIdStr = peer.toString();
-        byte[] privateKey = getPeerPrivateKey();
-        byte[] publicKey = getPeerPublicKey();
-
-        PeerId peerId = new PeerId(privateKey, publicKey, peerIdStr);
-        this.host = new Host(peerId);
 
         successfulBootNodes = getPeerStoreSize();
 
@@ -64,25 +53,19 @@ public void updateSuccessfulBootNodes() {
     @JSBody(script = "return window.fruzhin.libp?.peerId")
     public static native Object getPeerId();
 
-    @JSBody(script = "return window.fruzhin.libp.peerId.privateKey")
-    public static native byte[] getPeerPrivateKey();
-
-    @JSBody(script = "return window.fruzhin.libp.peerId.publicKey")
-    public static native byte[] getPeerPublicKey();
-
     @JSBody(script = "return window.fruzhin.libp.getConnections().length")
     public static native int getPeerStoreSize();
 
     /**
      * Populates Kademlia dht with peers closest in distance to a random id then makes connections with our node
      */
     @JSBody(script = "window.fruzhin.libp.peerStore.forEach( async (p) => {" +
-                     "    for await (const foundPeer of dht.peerRouting.getClosestPeers(p.id.toBytes())){" +
-                     "        if(foundPeer.peer?.multiaddrs?.length > 0){" +
-                     "            try{window.fruzhin.libp.dial(foundPeer.peer)}finally{}" +
-                     "        }" +
-                     "    }" +
-                     "});")
+            "    for await (const foundPeer of dht.peerRouting.getClosestPeers(p.id.toBytes())){" +
+            "        if(foundPeer.peer?.multiaddrs?.length > 0){" +
+            "            try{window.fruzhin.libp.dial(foundPeer.peer)}finally{}" +
+            "        }" +
+            "    }" +
+            "});")
     public static native void findNewPeers();
 
 }
diff --git a/src/main/java/com/limechain/network/kad/dto/Host.java b/src/main/java/com/limechain/network/kad/dto/Host.java
diff --git a/src/main/java/com/limechain/network/kad/dto/PeerId.java b/src/main/java/com/limechain/network/kad/dto/PeerId.java
diff --git a/src/main/webapp/genesis/ksmcc3.json b/src/main/webapp/genesis/ksmcc3.json
diff --git a/src/main/webapp/genesis/polkadot.json b/src/main/webapp/genesis/polkadot.json
diff --git a/src/main/webapp/genesis/westend2.json b/src/main/webapp/genesis/westend2.json
diff --git a/src/main/webapp/js/fruzhin-lib.js b/src/main/webapp/js/fruzhin-lib.js
@@ -1,16 +1,16 @@
-import 'https://unpkg.com/@chainsafe/[email protected]/dist/index.min.js';
-import 'https://unpkg.com/@chainsafe/[email protected]/dist/index.min.js';
-import 'https://unpkg.com/@libp2p/[email protected]/dist/index.min.js';
-import 'https://unpkg.com/@libp2p/[email protected]/dist/index.min.js';
-import 'https://unpkg.com/@libp2p/[email protected]/dist/index.min.js';
-import 'https://unpkg.com/@libp2p/[email protected]/dist/index.min.js';
-import 'https://unpkg.com/@libp2p/[email protected]/dist/index.min.js';
-import 'https://unpkg.com/@chainsafe/[email protected]/dist/index.min.js';
-import 'https://unpkg.com/[email protected]/dist/index.min.js';
-import 'https://unpkg.com/[email protected]/dist/index.min.js';
+import 'https://unpkg.com/@chainsafe/[email protected]/dist/index.min.js';
+import 'https://unpkg.com/@chainsafe/[email protected]/dist/index.min.js';
+import 'https://unpkg.com/@chainsafe/[email protected]/dist/index.min.js';
+import 'https://unpkg.com/[email protected]/dist/index.min.js';
+import 'https://unpkg.com/@libp2p/[email protected]/dist/index.min.js';
+import 'https://unpkg.com/@libp2p/[email protected]/dist/index.min.js';
+import 'https://unpkg.com/@libp2p/[email protected]/dist/index.min.js';
+import 'https://unpkg.com/@libp2p/[email protected]/dist/index.min.js';
+import 'https://unpkg.com/@libp2p/[email protected]/dist/index.min.js';
 import 'https://unpkg.com/[email protected]/dist/index.min.js';
-import 'https://unpkg.com/@muradsenteca/ed25519@1.0.0/dist/index.min.js'
+import 'https://unpkg.com/it-pipe@3.0.1/dist/index.min.js';
 import 'https://unpkg.com/@muradsenteca/[email protected]/dist/index.min.js'
+import 'https://unpkg.com/@muradsenteca/[email protected]/dist/index.min.js'
 
 import * as HTTP from './http.js';
 import * as Fruzhin from './fruzhin.js'
@@ -25,7 +25,7 @@ var startLibp2p = async (bootnodes) => {
             Libp2PWebsockets.webSockets()
         ],
         streamMuxers: [ChainsafeLibp2PYamux.yamux()],
-        connectionEncryption: [ChainsafeLibp2PNoise.noise()],
+        connectionEncrypters: [ChainsafeLibp2PNoise.noise()],
         peerDiscovery: [
             Libp2PBootstrap.bootstrap({
                 list: bootnodes