Merge pull request #1580 from o1-labs/dw/remove-salsa-simple

Move salsa-simple from tools/ to vendor/ and alphabetize workspace

Author: dannywillems

CHANGELOG.md

@@ -91,6 +91,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - **Development Tools**: Update taplo configuration to exclude `node_modules` and
   `target` directories from TOML formatting checks
   ([#1573](https://github.com/o1-labs/mina-rust/pull/1573))
+- **Build System**: Move salsa-simple from tools/ to vendor/ and alphabetize
+  workspace members. salsa-simple is a vendored XSalsa20 implementation with
+  serde support, not a command-line tool
+  ([#1580](https://github.com/o1-labs/mina-rust/pull/1580))
 - **CI**: Speed up CI by decoupling test runs from full build completion.
   Created dedicated single-platform build jobs that run only on ubuntu-22.04
   to produce artifacts needed for testing, allowing tests to start as soon as

Cargo.toml

@@ -1,38 +1,34 @@
 [workspace]
 members = [
+  "cli",
+  "cli/replay_dynamic_effects",
   "core",
-  "macros",
+  "fuzzer",
   "ledger",
-  "snark",
-  "p2p",
-  "p2p/testing",
-  "p2p/libp2p-rpc-behaviour",
+  "macros",
+  "mina-p2p-messages",
   "node",
   "node/account",
   "node/common",
-  "node/native",
-  "node/web",
   "node/invariants",
+  "node/native",
   "node/testing",
-  "cli",
-  "cli/replay_dynamic_effects",
-  "vrf",
-
-  "mina-p2p-messages",
-  "ledger",
+  "node/web",
+  "p2p",
+  "p2p/libp2p-rpc-behaviour",
+  "p2p/testing",
   "poseidon",
-
-  "tools/transport",
+  "snark",
+  "tools/archive-breadcrumb-compare",
   "tools/bootstrap-sandbox",
+  "tools/fuzzing",
   "tools/gossipsub-sandbox",
   "tools/hash-tool",
   "tools/ledger-tool",
-  "tools/salsa-simple",
-  "tools/fuzzing",
-  "tools/archive-breadcrumb-compare",
+  "tools/transport",
   "tools/webrtc-sniffer",
-
-  "fuzzer",
+  "vendor/salsa-simple",
+  "vrf",
 ]
 
 resolver = "2"
@@ -195,7 +191,7 @@ rsexp = "0.2.3"
 rsexp-derive = "0.2.3"
 rsprocmaps = "0.3.2"
 rust-format = "0.3"
-salsa-simple = { path = "tools/salsa-simple" }
+salsa-simple = { path = "vendor/salsa-simple" }
 salsa20 = "0.10.2"
 serde = { version = "1.0.190", features = ["derive", "rc"] }
 serde_bytes = "0.11"

frontend/Dockerfile

@@ -74,6 +74,7 @@ COPY p2p ./p2p
 COPY poseidon ./poseidon
 COPY snark ./snark
 COPY tools ./tools
+COPY vendor ./vendor
 COPY vrf ./vrf
 
 # Build WebAssembly using Makefile (source VERGEN variables from .env.docker)

frontend/angular.json

@@ -72,7 +72,15 @@
                   "with": "src/environments/environment.prod.ts"
                 }
               ],
-              "outputHashing": "all"
+              "outputHashing": "all",
+              "optimization": {
+                "scripts": true,
+                "styles": {
+                  "minify": true,
+                  "inlineCritical": false
+                },
+                "fonts": false
+              }
             },
             "development": {
               "optimization": false,

tools/salsa-simple/Cargo.toml renamed to vendor/salsa-simple/Cargo.toml

@@ -1,3 +1,29 @@
+//! Vendored XSalsa20 stream cipher implementation with serde support.
+//!
+//! This is a custom implementation of the XSalsa20 stream cipher algorithm
+//! that provides serialization support via serde, which is required for
+//! persisting P2P network connection state in the Redux state machine.
+//!
+//! # Why vendored?
+//!
+//! The external [`salsa20`](https://crates.io/crates/salsa20) crate (v0.10.2)
+//! does not provide serde support for serializing/deserializing cipher state.
+//! This is needed for:
+//! - Persisting P2P pnet encryption state across restarts
+//! - State snapshots in the Redux architecture
+//! - Debugging and inspection capabilities
+//!
+//! # Implementation
+//!
+//! This implementation manually implements the XSalsa20 algorithm and adds
+//! `Serialize` and `Deserialize` derives. It is tested against the external
+//! `salsa20` crate (used as a dev-dependency) to ensure correctness.
+//!
+//! # Usage
+//!
+//! Used in `p2p/src/network/pnet/` for P2P private network encryption,
+//! providing encrypted communication between peers with serializable state.
+
 #[cfg(test)]
 mod tests;