Attestation Propagation simulation work

.gitignore

@@ -11,7 +11,6 @@ shadow.data/
 topology.json
 gossipsub/topology.json
 shadow-gossipsub.yaml
-message_propagation.png
 
 # Go build artifacts
 *.out

Makefile

@@ -4,12 +4,16 @@
 
 # Default parameters
 NODE_COUNT ?= 10
+NODES_TO_PUBLISH ?= 10
+NODES_TO_SUBSCRIBE ?=10
 MSG_SIZE ?= 256
 TOPOLOGY_TYPE ?= random-regular
 PEER_COUNT ?= 4
 BRANCHING ?= 2
 PROGRESS ?= false
 LOG_LEVEL ?= info
+BATCH_INTERVAL ?= 5
+BATCH_VERIFIER_TIME ?= 4500
 
 # Paths
 TOPOLOGY_GEN_DIR = topology/gen
@@ -46,28 +50,28 @@ build: check-deps
 
 # Generate network graph and Shadow configuration
 generate-config: generate-topology
-	@echo "Generating Shadow network configuration for $(NODE_COUNT) nodes..."
-	uv run network_graph.py $(NODE_COUNT) $(MSG_SIZE) $(TOPOLOGY_FILE)
+	@echo "Generating Shadow network configuration for $(NODE_COUNT) nodes with $(NODES_TO_PUBLISH) publishers and $(NODES_TO_SUBSCRIBE) subscribers..."
+	uv run network_graph.py $(NODE_COUNT) $(MSG_SIZE) $(TOPOLOGY_FILE) $(NODES_TO_PUBLISH) $(NODES_TO_SUBSCRIBE) $(BATCH_INTERVAL) $(BATCH_VERIFIER_TIME)
 	@test -f shadow-gossipsub.yaml && test -f graph.gml || (echo "Config generation failed" && exit 1)
 	@echo "Configuration generated"
 
 # Run the complete Shadow simulation
 run-sim: build generate-config
-	@echo "Starting GossipSub Shadow simulation ($(NODE_COUNT) nodes, $(MSG_SIZE) byte message)..."
+	@echo "Starting GossipSub Shadow simulation ($(NODE_COUNT) nodes, $(NODES_TO_PUBLISH) publishers, $(NODES_TO_SUBSCRIBE) subscribers, $(MSG_SIZE) byte message)..."
 	@rm -rf shadow.data/
 	shadow --progress $(PROGRESS) shadow-gossipsub.yaml
 	@echo "GossipSub simulation completed"
 
 # Test simulation results
 test:
 	@echo "Testing GossipSub simulation results..."
-	uv run test_results.py $(NODE_COUNT)
+	uv run test_results.py $(NODE_COUNT) $(NODES_TO_PUBLISH) $(NODES_TO_SUBSCRIBE)
 
 # Plot message propagation
 plot:
 	@echo "Plotting message propagation..."
-	uv run plot_propagation.py $(NODE_COUNT)
-	@test -f message_propagation.png && echo "Plot generated: message_propagation.png" || echo "Plot generation failed"
+	uv run plot_propagation.py $(NODE_COUNT) -p $(NODES_TO_PUBLISH) -s $(NODES_TO_SUBSCRIBE) --peer-count $(PEER_COUNT) --batch-interval $(BATCH_INTERVAL) --batch-verifier-time $(BATCH_VERIFIER_TIME) -o plots/batch_$(BATCH_INTERVAL)ms_node$(NODE_COUNT)_publishers$(NODES_TO_PUBLISH)_subscribers$(NODES_TO_SUBSCRIBE).png
+	@test -f plots/batch_$(BATCH_INTERVAL)ms_node$(NODE_COUNT)_publishers$(NODES_TO_PUBLISH)_subscribers$(NODES_TO_SUBSCRIBE).png && echo "Plot generated: plots/batch_$(BATCH_INTERVAL)ms_node$(NODE_COUNT)_publishers$(NODES_TO_PUBLISH)_subscribers$(NODES_TO_SUBSCRIBE).png" || echo "Plot generation failed"
 
 # Clean build artifacts and simulation results
 clean:
@@ -103,20 +107,27 @@ help:
 	@echo "  help               - Show this help message"
 	@echo ""
 	@echo "Configuration variables:"
-	@echo "  NODE_COUNT      - Number of nodes (default: $(NODE_COUNT))"
-	@echo "  MSG_SIZE        - Message size in bytes (default: $(MSG_SIZE))"
-	@echo "  TOPOLOGY_TYPE   - Topology type: mesh, tree, random-regular (default: $(TOPOLOGY_TYPE))"
-	@echo "  PEER_COUNT      - Peer count for random-regular (default: $(PEER_COUNT))"
-	@echo "  BRANCHING       - Branching factor for tree (default: $(BRANCHING))"
-	@echo "  PROGRESS        - Show Shadow progress bar (default: $(PROGRESS))"
-	@echo "  LOG_LEVEL       - Log level (default: $(LOG_LEVEL))"
+	@echo "  NODE_COUNT        - Number of nodes (default: $(NODE_COUNT))"
+	@echo "  NODES_TO_PUBLISH  - Number of nodes that will publish messages (default: $(NODES_TO_PUBLISH))"
+	@echo "  NODES_TO_SUBSCRIBE - Number of nodes that will subscribe to messages (default: $(NODES_TO_SUBSCRIBE))"
+	@echo "  MSG_SIZE          - Message size in bytes (default: $(MSG_SIZE))"
+	@echo "  TOPOLOGY_TYPE     - Topology type: mesh, tree, random-regular (default: $(TOPOLOGY_TYPE))"
+	@echo "  PEER_COUNT        - Peer count for random-regular (default: $(PEER_COUNT))"
+	@echo "  BRANCHING         - Branching factor for tree (default: $(BRANCHING))"
+	@echo "  PROGRESS          - Show Shadow progress bar (default: $(PROGRESS))"
+	@echo "  LOG_LEVEL         - Log level (default: $(LOG_LEVEL))"
+	@echo "  BATCH_INTERVAL    - BLS batch interval in milliseconds (default: $(BATCH_INTERVAL))"
+	@echo "  BATCH_VERIFIER_TIME - BLS batch verifier time in microseconds (default: $(BATCH_VERIFIER_TIME))"
 	@echo ""
 	@echo "Examples:"
 	@echo "  make all                                           # Run simulation, test, and plot (random-regular)"
 	@echo "  make run-sim NODE_COUNT=20 MSG_SIZE=512           # Custom parameters"
+	@echo "  make run-sim NODE_COUNT=20 NODES_TO_PUBLISH=5     # 20 nodes, only 5 publish"
+	@echo "  make run-sim NODE_COUNT=20 NODES_TO_PUBLISH=5 NODES_TO_SUBSCRIBE=15  # 5 publishers, 15 subscribers"
 	@echo "  make run-sim TOPOLOGY_TYPE=mesh NODE_COUNT=10     # Mesh topology"
 	@echo "  make run-sim TOPOLOGY_TYPE=tree NODE_COUNT=31 BRANCHING=2  # Tree topology"
 	@echo "  make run-sim TOPOLOGY_TYPE=random-regular PEER_COUNT=6    # Random-regular with 6 peers"
 	@echo "  make run-sim PROGRESS=true                        # Run with progress bar"
+	@echo "  make run-sim BATCH_INTERVAL=2 BATCH_VERIFIER_TIME=2000  # Custom batch parameters"
 	@echo "  make test                                          # Test existing simulation results"
 	@echo "  make plot NODE_COUNT=10                            # Plot message propagation"