Merge remote-tracking branch 'origin/develop' into feature/better-mem…

…pool-locking

Dockerfile

@@ -215,7 +215,7 @@ RUN apt-get update -y \
     # Fixes CVE-2023-4911 can be removed when we update the base OS image to include this fix
     # docker run -it debian:12.1-slim ldd --version
     # This fix can be removed as long as the version printed in the above command is 2.36-9+deb12u3 or above
-    libc6=2.36-9+deb12u3 \ 
+    libc6=2.36-9+deb12u4 \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 

README.md

@@ -32,17 +32,8 @@ some of our tests.
 
 ## Contribute
 
-To contribute, you'll need to [setup development environment](docs/development/README.md).
-
-[Contributions](CONTRIBUTING.md) are welcome, we simply ask to:
-
-* Fork the codebase
-* Make changes
-* Submit a pull request for review
-
-When contributing to this repository, we recommend discussing with the development team the change you wish to make using a [GitHub issue](https://github.com/radixdlt/radixdlt/issues) before making changes.
-
 Please follow our [Code of Conduct](CODE_OF_CONDUCT.md) in all your interactions with the project.
+See the [Contributing Guide](CONTRIBUTING.md) for more details on how to get involved.
 
 ## Links
 
@@ -55,9 +46,9 @@ Please follow our [Code of Conduct](CODE_OF_CONDUCT.md) in all your interactions
 
 ## License
 
-The executable components of the Babylon Node Code are licensed under the [Radix Node EULA](http://www.radixdlt.com/terms/nodeEULA).
+The executable components of the Babylon Node code are licensed under the [Radix Node EULA](http://www.radixdlt.com/terms/nodeEULA).
 
-The Babylon Node Code is released under the [Radix License 1.0 (modified Apache 2.0)](LICENSE):
+The Babylon Node code is released under the [Radix License 1.0 (modified Apache 2.0)](LICENSE):
 
 ```
 Copyright 2023 Radix Publishing Ltd incorporated in Jersey, Channel Islands.
@@ -130,4 +121,4 @@ operation logic, functionality, security and appropriateness of using the Work
 for any commercial or non-commercial purpose and for any reproduction or
 redistribution by You of the Work. You assume all risks associated with Your use
 of the Work and the exercise of permissions under this Licence.
-```
+```

common/src/main/java/com/radixdlt/crypto/RadixKeyStore.java

@@ -110,11 +110,9 @@
  * store,
  *
  * <p><b>Implementation note:</b><br>
- * This store uses a PKCS#12 representation for the underlying storage, and the store requires a
- * non-empty password to protect it. In order to ease unattended use, note that where a password is
- * required, a {@code null}, or zero length password may be provided, in which case the default 5
- * character password, "radix" is used. Clearly this is insecure, and clients should make an effort
- * to specify passwords in a secure way.
+ * This store uses a PKCS#12 representation for the underlying storage. It's required to supply a
+ * non-null password for the keystore, but it can be empty. An empty password will be used as-is,
+ * without any replacement default.
  */
 @SecurityCritical(SecurityKind.KEY_STORE)
 public final class RadixKeyStore implements Closeable {

common/src/main/java/com/radixdlt/monitoring/Metrics.java

@@ -192,7 +192,7 @@ public record Bft(
       Summary leaderTransactionBytesIncludedInProposal,
       Summary leaderTransactionBytesIncludedInProposalAndPreviousVertices,
       Summary numSignaturesInCertificate,
-      Counter divergentVertexExecutions) {
+      LabelledCounter<DivergentVertexExecution> divergentVertexExecutions) {
 
     public record SuccessfullyProcessedVote(boolean isTimeout, VoteProcessingResult result) {}
 
@@ -234,6 +234,8 @@ public record Sync(
 
     public record VertexStore(
         Gauge size, Counter forks, Counter rebuilds, Counter indirectParents) {}
+
+    public record DivergentVertexExecution(int numDistinctExecutionResults) {}
   }
 
   public record BerkeleyDb(AddressBook addressBook, SafetyState safetyState) {