Merge branch 'main' into feat/fix-node-restart

Author: randygrok

apps/evm/single/docker-compose.yml

@@ -58,6 +58,9 @@ services:
         condition: service_started
       local-da:
         condition: service_started
+    ports:
+      - "7676:7676" # p2p
+      - "7331:7331" # rpc
     volumes:
       - evm-single-data:/root/.evm-single/
     restart: always

apps/grpc/single/README.md

@@ -72,7 +72,7 @@ Start the Rollkit node with:
 - `--da.address`: Data availability layer address
 - `--da.auth-token`: Authentication token for DA layer
 - `--da.namespace`: Namespace for DA layer (optional)
-- `--p2p.listen-address`: P2P listen address (default: `/ip4/0.0.0.0/tcp/26656`)
+- `--p2p.listen-address`: P2P listen address (default: `/ip4/0.0.0.0/tcp/7676`)
 - `--block-time`: Time between blocks (default: `1s`)
 
 ## Example: Running with Local DA

client/crates/types/README.md

@@ -1,6 +1,6 @@
-# rollkit-types
+# ev-types
 
-Proto-generated types for Rollkit.
+Proto-generated types for Ev-node.
 
 ## Features
 
@@ -13,7 +13,7 @@ Proto-generated types for Rollkit.
 
 ```toml
 [dependencies]
-rollkit-types = "0.1"
+ev-types = "0.0.1"
 ```
 
 ### Types only (without gRPC)
@@ -22,12 +22,12 @@ If you only need the message types without gRPC client/server code:
 
 ```toml
 [dependencies]
-rollkit-types = { version = "0.1", default-features = false }
+ev-types = { version = "0.0.1", default-features = false }
 ```
 
 This is useful when:
 
-- You only need to serialize/deserialize Rollkit messages
+- You only need to serialize/deserialize Ev-node messages
 - You're using a different RPC framework
 - You want to minimize dependencies
 - You're building for environments where gRPC is not needed
@@ -36,33 +36,41 @@ This is useful when:
 
 This crate generates two versions of the protobuf code:
 
-1. **`rollkit.v1.messages.rs`** - Contains only the message types (structs/enums) with no gRPC dependencies
-2. **`rollkit.v1.services.rs`** - Contains everything including gRPC client/server code
+1. **`evnode.v1.messages.rs`** - Contains only the message types (structs/enums) with no gRPC dependencies
+2. **`evnode.v1.services.rs`** - Contains everything including gRPC client/server code
 
 Both files are pre-generated and checked into the repository, so users don't need `protoc` installed or need to regenerate based on their feature selection.
 
 ## Building
 
-The proto files are automatically generated during the build process:
+The crate uses pre-generated proto files that are checked into version control. This ensures that the crate can be built from crates.io without requiring access to the original `.proto` files.
 
 ```bash
 cargo build
 ```
 
+The build script will:
+1. Check if pre-generated files exist (`src/proto/evnode.v1.*.rs`)
+2. If they exist, use them (this is the default behavior)
+3. If they don't exist, attempt to generate them from source proto files
+
 ## Proto Generation
 
 The generated code is committed to the repository. If you modify the proto files, you need to regenerate:
 
 ```bash
-# From the repository root
-make rust-proto-gen
+# Force regeneration by setting the environment variable
+EV_TYPES_FORCE_PROTO_GEN=1 cargo build
 
-# Or directly
-cd client/crates/rollkit-types
-cargo build
+# Or from the repository root (if a make target exists)
+make rust-proto-gen
 ```
 
-**Important**: The build process generates both `rollkit.v1.messages.rs` and `rollkit.v1.services.rs`. Both files should be committed to ensure users can use the crate without needing to regenerate based on their feature selection.
+**Important**: 
+- The build process generates both `evnode.v1.messages.rs` and `evnode.v1.services.rs`
+- Both files should be committed to ensure users can use the crate without needing to regenerate
+- When publishing to crates.io, the pre-generated files are included in the package
+- Users installing from crates.io will use the pre-generated files automatically
 
 ## Version Consistency
 

client/crates/types/build.rs

@@ -4,8 +4,39 @@ use walkdir::WalkDir;
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let manifest_dir_str = env::var("CARGO_MANIFEST_DIR")?;
     let manifest_dir = Path::new(&manifest_dir_str);
+
+    // Create output directories
+    let proto_dir = manifest_dir.join("src/proto");
+    fs::create_dir_all(&proto_dir)?;
+
+    // Check if generated files already exist
+    let messages_file = proto_dir.join("evnode.v1.messages.rs");
+    let services_file = proto_dir.join("evnode.v1.services.rs");
+
+    // Check for environment variable to force regeneration
+    let force_regen = env::var("EV_TYPES_FORCE_PROTO_GEN").is_ok();
+
+    // If files exist and we're not forcing regeneration, skip generation
+    if !force_regen && messages_file.exists() && services_file.exists() {
+        println!("cargo:warning=Using pre-generated proto files. Set EV_TYPES_FORCE_PROTO_GEN=1 to regenerate.");
+        return Ok(());
+    }
+
     // Make the include dir absolute and resolved (no "..", symlinks, etc.)
-    let proto_root = manifest_dir.join("../../../proto").canonicalize()?;
+    let proto_root = match manifest_dir.join("../../../proto").canonicalize() {
+        Ok(path) => path,
+        Err(e) => {
+            // If proto files don't exist but generated files do, that's ok
+            if messages_file.exists() && services_file.exists() {
+                println!("cargo:warning=Proto source files not found at ../../../proto, using pre-generated files");
+                return Ok(());
+            }
+            // Otherwise, this is a real error
+            return Err(
+                format!("Proto files not found and no pre-generated files available: {e}").into(),
+            );
+        }
+    };
 
     // Collect the .proto files
     let proto_files: Vec<_> = WalkDir::new(&proto_root)
@@ -16,10 +47,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         })
         .collect();
 
-    // Create output directories
-    let proto_dir = manifest_dir.join("src/proto");
-    fs::create_dir_all(&proto_dir)?;
-
     // Always generate both versions and keep them checked in
     // This way users don't need to regenerate based on features
 

pkg/p2p/README.md

@@ -53,8 +53,8 @@ type P2PConfig struct {
 
 | Parameter | Description | Default | Example |
 |-----------|-------------|---------|---------|
-| ListenAddress | The address where the node listens for incoming P2P connections | `/ip4/0.0.0.0/tcp/26656` | `/ip4/0.0.0.0/tcp/26656` |
-| Seeds | Comma-separated list of seed nodes (bootstrap nodes) | "" | `/ip4/1.2.3.4/tcp/26656/p2p/12D3KooWA8EXV3KjBxEU...,/ip4/5.6.7.8/tcp/26656/p2p/12D3KooWJN9ByvD...` |
+| ListenAddress | The address where the node listens for incoming P2P connections | `/ip4/0.0.0.0/tcp/7676` | `/ip4/0.0.0.0/tcp/7676` |
+| Seeds | Comma-separated list of seed nodes (bootstrap nodes) | "" | `/ip4/1.2.3.4/tcp/7676/p2p/12D3KooWA8EXV3KjBxEU...,/ip4/5.6.7.8/tcp/7676/p2p/12D3KooWJN9ByvD...` |
 | BlockedPeers | Comma-separated list of peer IDs to block | "" | `12D3KooWA8EXV3KjBxEU...,12D3KooWJN9ByvD...` |
 | AllowedPeers | Comma-separated list of peer IDs to explicitly allow | "" | `12D3KooWA8EXV3KjBxEU...,12D3KooWJN9ByvD...` |
 
@@ -202,8 +202,8 @@ These metrics can be exposed via Prometheus for monitoring and alerting.
 conf := config.Config{
     RootDir: "/path/to/root",
     P2P: config.P2PConfig{
-        ListenAddress: "/ip4/0.0.0.0/tcp/26656",
-        Seeds: "/ip4/1.2.3.4/tcp/26656/p2p/12D3KooWXYZ...,/ip4/5.6.7.8/tcp/26656/p2p/12D3KooWABC...",
+        ListenAddress: "/ip4/0.0.0.0/tcp/7676",
+        Seeds: "/ip4/1.2.3.4/tcp/7676/p2p/12D3KooWXYZ...,/ip4/5.6.7.8/tcp/7676/p2p/12D3KooWABC...",
     },
 }
 

pkg/rpc/README.md

@@ -36,7 +36,7 @@ func main() {
     myStore := store.NewKVStore(...)
 
     // Start the RPC server
-    log.Fatal(server.StartServer(myStore, "localhost:8080"))
+    log.Fatal(server.StartServer(myStore, "localhost:7331"))
 }
 ```
 
@@ -54,7 +54,7 @@ import (
 
 func main() {
     // Create a client
-    storeClient := client.NewStoreClient("http://localhost:8080")
+    storeClient := client.NewStoreClient("http://localhost:7331")
 
     // Use the client to interact with the store
     ctx := context.Background()

pkg/sync/sync_service.go

@@ -385,9 +385,9 @@ func getPeers(seeds string, logger logging.EventLogger) []peer.ID {
 	if seeds == "" {
 		return peerIDs
 	}
-	sl := strings.Split(seeds, ",")
+	sl := strings.SplitSeq(seeds, ",")
 
-	for _, seed := range sl {
+	for seed := range sl {
 		maddr, err := multiaddr.NewMultiaddr(seed)
 		if err != nil {
 			logger.Error("failed to parse peer", "address", seed, "error", err)

test/docker-e2e/go.mod

@@ -86,7 +86,7 @@ require (
 	github.com/dgraph-io/badger/v4 v4.2.0 // indirect
 	github.com/dgraph-io/ristretto v0.1.1 // indirect
 	github.com/distribution/reference v0.6.0 // indirect
-	github.com/docker/docker v28.2.2+incompatible // indirect
+	github.com/docker/docker v28.3.3+incompatible // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect

test/docker-e2e/go.sum

@@ -227,8 +227,8 @@ github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WA
 github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/docker/docker v28.2.2+incompatible h1:CjwRSksz8Yo4+RmQ339Dp/D2tGO5JxwYeqtMOEe0LDw=
-github.com/docker/docker v28.2.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v28.3.3+incompatible h1:Dypm25kh4rmk49v1eiVbsAtpAsYURjYkaKubwuBdxEI=
+github.com/docker/docker v28.3.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
 github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=