Added check in getCrossChainEdges to prevent event-function links in the same contract.

Author: merendamattia

src/main/java/it/unipr/analysis/contract/SmartContract.java

@@ -846,6 +846,24 @@ public boolean toFile() {
 		return true;
 	}
 
+	@Override
+	public boolean equals(Object o) {
+		if (o == null)
+			return false;
+		if (!(o instanceof SmartContract))
+			return false;
+		if (this == o)
+			return true;
+		SmartContract contract = (SmartContract) o;
+		return _bytecode.equals(contract._bytecode)
+				&& _cfg.equals(contract._cfg);
+	}
+
+	@Override
+	public int hashCode() {
+		return 13 * _bytecode.hashCode() + 17 * _cfg.hashCode();
+	}
+
 	/**
 	 * Extracts the filename without extension from a given Path.
 	 *

src/main/java/it/unipr/crosschain/xEVMLiSA.java

@@ -94,27 +94,36 @@ public static Set<Edge> getCrossChainEdgesUsingEventsAndFunctionsEntrypoint(Brid
 		log.debug("Events in bridge: {}.", bridge.getEvents().size());
 		log.debug("Log statement in bridge: {}.", bridge.getXCFG().getAllLogX().size());
 
-		for (Signature event : bridge.getEvents()) {
-			for (Signature function : bridge.getFunctions()) {
-
-				if (xEVMLiSA.defaultPolicy(event, function)) {
-					functionsUsed.add(function.getFullSignature());
-					eventUsed.add(event.getFullSignature());
-
-					crossChainEdges.addAll(
-							addCrossChainEdges(event.getExitPoints(), function.getEntryPoints()));
-
-					MyCache.getInstance().addMapEventsFunctions(event, function);
-
-					// Debug print
-					for (Statement e : event.getExitPoints()) {
-						for (Statement f : function.getEntryPoints()) {
-							log.debug(
-									"Cross-chain edge added: event {} (name: {}, selector: {}, line: {}) -> function {} (name: {}, selector: {}, line: {}).",
-									e, event.getFullSignature(), event.getSelector(),
-									((ProgramCounterLocation) e.getLocation()).getSourceCodeLine(),
-									f, function.getFullSignature(), function.getSelector(),
-									((ProgramCounterLocation) f.getLocation()).getSourceCodeLine());
+		for (SmartContract contractSource : bridge.getSmartContracts()) {
+			for (SmartContract contractDestination : bridge.getSmartContracts()) {
+				if (contractSource.equals(contractDestination))
+					continue; // Avoid auto-link
+
+				for (Signature event : contractSource.getEventsSignature()) {
+					for (Signature function : contractDestination.getFunctionsSignature()) {
+
+						if (xEVMLiSA.defaultPolicy(event, function)) {
+							functionsUsed.add(function.getFullSignature());
+							eventUsed.add(event.getFullSignature());
+
+							crossChainEdges.addAll(
+									addCrossChainEdges(event.getExitPoints(), function.getEntryPoints()));
+
+							MyCache.getInstance().addMapEventsFunctions(event, function);
+
+							// Debug print
+							for (Statement e : event.getExitPoints()) {
+								for (Statement f : function.getEntryPoints()) {
+									log.debug(
+											"Cross-chain edge added: from contract {} with event {} (name: {}, selector: {}, line: {}) to contract {} with function {} (name: {}, selector: {}, line: {}).",
+											contractSource.getName(),
+											e, event.getFullSignature(), event.getSelector(),
+											((ProgramCounterLocation) e.getLocation()).getSourceCodeLine(),
+											contractDestination.getName(),
+											f, function.getFullSignature(), function.getSelector(),
+											((ProgramCounterLocation) f.getLocation()).getSourceCodeLine());
+								}
+							}
 						}
 					}
 				}
@@ -131,7 +140,7 @@ public static Set<Edge> getCrossChainEdgesUsingEventsAndFunctionsEntrypoint(Brid
 	}
 
 	/**
-	 * Checks if the default policy is to match events and functions by name.
+	 * Matches events and functions by name.
 	 *
 	 * @param event    The event signature to compare with the function's name.
 	 * @param function The function signature whose name will be compared with