Add solutionthreshold to system_info (#85)

* Add solutionthreshold to system_info * Fix struct alignment and potential out-of-bounds access --------- Co-authored-by: Philipp Werner <[email protected]>
qubic · Apr 4, 2024 · 775c1f5 · 775c1f5
1 parent 082e237
commit 775c1f5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/network_messages/system_info.h b/src/network_messages/system_info.h
@@ -7,6 +7,7 @@
 
 #define RESPOND_SYSTEM_INFO 47
 
+#pragma pack(push, 1)
 struct RespondSystemInfo
 {
     short version;
@@ -27,6 +28,8 @@ struct RespondSystemInfo
     unsigned int numberOfTransactions;
 
     m256i randomMiningSeed;
+    int solutionThreshold;
 };
+#pragma pack(pop)
 
-static_assert(sizeof(RespondSystemInfo) == 2 + 2 + 4 + 4 + 4 + 2 + 1 + 1 + 1 + 1 + 1 + 1 + 4 + 32 + 4, "Something is wrong with the struct size of RespondSystemInfo.");
+static_assert(sizeof(RespondSystemInfo) == (2 + 2 + 4 + 4 + 4) + (2 + 1 + 1 + 1 + 1 + 1 + 1) + (4 + 4) + (32 + 4), "Something is wrong with the struct size of RespondSystemInfo.");
diff --git a/src/qubic.cpp b/src/qubic.cpp
@@ -1098,6 +1098,7 @@ static void processRequestSystemInfo(Peer* peer, RequestResponseHeader* header)
     respondedSystemInfo.numberOfTransactions = numberOfTransactions;
 
     respondedSystemInfo.randomMiningSeed = score->initialRandomSeed;
+    respondedSystemInfo.solutionThreshold = (system.epoch < MAX_NUMBER_EPOCH) ? solutionThreshold[system.epoch] : SOLUTION_THRESHOLD_DEFAULT;
 
     enqueueResponse(peer, sizeof(respondedSystemInfo), RESPOND_SYSTEM_INFO, header->dejavu(), &respondedSystemInfo);
 }