Merge remote-tracking branch 'origin/main'

Former-commit-id: 9ab47fd365beadb06c96f34efd351620d62278a7 [formerly 724ea098c74b5efca28918a86f77b5afc193ac41] Former-commit-id: b84dc545b0c7a6ee0532c841f416d72639963b36
hyajam · Sep 1, 2023 · c41a56d · c41a56d
2 parents 1662885 + f2de39e
commit c41a56d
Show file tree

Hide file tree

Showing 48 changed files with 822 additions and 13 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/data/86-regions/bandwidth_mbps.csv b/data/86-regions/bandwidth_mbps.csv
diff --git a/data/86-regions/bitcoin-mining_dist.csv b/data/86-regions/bitcoin-mining_dist.csv
diff --git a/data/86-regions/bitcoin-nodes_dist.csv b/data/86-regions/bitcoin-nodes_dist.csv
diff --git a/data/86-regions/country_names.csv b/data/86-regions/country_names.csv
diff --git a/data/86-regions/ehereum-nodes_dist.csv b/data/86-regions/ehereum-nodes_dist.csv
diff --git a/data/86-regions/latency_ms.csv b/data/86-regions/latency_ms.csv
diff --git a/data/bitcoin/Bitcoinnodes/node-by-country.csv b/data/bitcoin/Bitcoinnodes/node-by-country.csv
diff --git a/data/bitcoin/cbeci-mining_map-bitcoin-mining/cbeci-mining_map.csv b/data/bitcoin/cbeci-mining_map-bitcoin-mining/cbeci-mining_map.csv
diff --git a/data/ethereum/ethernodes.org_nodes_distribution.csv b/data/ethereum/ethernodes.org_nodes_distribution.csv
diff --git a/data/network-stats/speedtest-bandwidth-data/countries.csv b/data/network-stats/speedtest-bandwidth-data/countries.csv
diff --git a/data/network-stats/speedtest-bandwidth-data/data.csv b/data/network-stats/speedtest-bandwidth-data/data.csv
diff --git a/data/network-stats/speedtest-bandwidth-data/intersection.csv b/data/network-stats/speedtest-bandwidth-data/intersection.csv
diff --git a/data/network-stats/wonderproxy-ping/countries-vertical.csv b/data/network-stats/wonderproxy-ping/countries-vertical.csv
diff --git a/data/network-stats/wonderproxy-ping/countries.csv b/data/network-stats/wonderproxy-ping/countries.csv
diff --git a/data/network-stats/wonderproxy-ping/latency_matrix.csv b/data/network-stats/wonderproxy-ping/latency_matrix.csv
diff --git a/data/network-stats/wonderproxy-ping/latency_matrix_with_names.csv b/data/network-stats/wonderproxy-ping/latency_matrix_with_names.csv
diff --git a/data/network-stats/wonderproxy-ping/pings-2020-07-19-2020-07-20.7z b/data/network-stats/wonderproxy-ping/pings-2020-07-19-2020-07-20.7z
diff --git a/data/network-stats/wonderproxy-ping/pings-2020-07-19-2020-07-20.7z.REMOVED.git-id b/data/network-stats/wonderproxy-ping/pings-2020-07-19-2020-07-20.7z.REMOVED.git-id
diff --git a/data/network-stats/wonderproxy-ping/servers-2020-07-19.csv b/data/network-stats/wonderproxy-ping/servers-2020-07-19.csv
diff --git a/src/main/java/jabs/Main.java b/src/main/java/jabs/Main.java
@@ -2,10 +2,7 @@
 
 import jabs.ledgerdata.bitcoin.BitcoinBlockWithoutTx;
 import jabs.log.*;
-import jabs.scenario.AbstractScenario;
-import jabs.scenario.BitcoinGlobalNetworkScenario;
-import jabs.scenario.NormalEthereumNetworkScenario;
-import jabs.scenario.PBFTLANScenario;
+import jabs.scenario.*;
 
 import java.io.IOException;
 import java.nio.file.Paths;
@@ -20,7 +17,7 @@ public class Main {
      */
     public static void main(String[] args) throws IOException {
         AbstractScenario scenario;
-
+/*
         // Simulate one day in the life of Bitcoin network
         // Nakamoto protocol with block every 600 seconds
         // Around 8000 nodes with 30 miners
@@ -53,5 +50,11 @@ public static void main(String[] args) throws IOException {
                 40, 3600);
         scenario.AddNewLogger(new PBFTCSVLogger(Paths.get("output/pbft-simulation-log.csv")));
         scenario.run();
+*/
+        // Simulate Snow LAN network of 40 nodes for 1 hour
+        scenario = new SnowLANScenario("One hour of a Snow lan Network", 1, 40,
+                3600);
+        scenario.AddNewLogger(new SnowCSVLogger(Paths.get("output/snow-simulation-log.csv")));
+        scenario.run();
     }
 }
diff --git a/src/main/java/jabs/consensus/algorithm/QueryingBasedConsensus.java b/src/main/java/jabs/consensus/algorithm/QueryingBasedConsensus.java
@@ -0,0 +1,9 @@
+package jabs.consensus.algorithm;
+
+import jabs.ledgerdata.Block;
+import jabs.ledgerdata.Tx;
+import jabs.ledgerdata.Query;
+
+public interface QueryingBasedConsensus <B extends Block<B>, T extends Tx<T>> extends ConsensusAlgorithm<B, T>{
+    void newIncomingQuery(Query query);
+}