Merge pull request #5 from timewave-computer/sam/feat-geth-lighthouse

adds geth and lighthouse [macos]

Author: hxrts

.gitignore

@@ -28,4 +28,16 @@ Cargo.lock
 *.orig
 
 # Working
-work/
+work/
+
+# Ethereum node data directories
+data/
+geth/
+lighthouse/
+
+# Ethereum authentication
+*.hex
+jwt.secret
+
+# Test directories
+/tmp/test-*

docs/default.nix

@@ -36,7 +36,10 @@
 
       docsFlake = flake-parts-lib.mkFlake { inherit inputs; } {
         systems = [ system ];
-        imports = [ "${inputs.flake-parts-website}/render/render-module.nix" ];
+        imports = [ 
+          "${inputs.flake-parts-website}/render/render-module.nix" 
+          inputs.devshell.flakeModule
+        ];
         perSystem.render.officialFlakeInputs = inputs;
         perSystem.render.inputs =
           {

docs/reference/flake-modules/index.md

@@ -1,4 +1,4 @@
 # Flake Modules Reference
 - [Upload Contracts Options](./upload-contracts.md)
-- [Upload Valence Contracts Options](./upload-valence-contracts.md)
+- [Valence Contracts Options](./valence-contracts.md)
 

docs/reference/nixos-modules/index.md

@@ -0,0 +1 @@
+# NixOS Modules Reference 

flake.lock

@@ -17,14 +17,26 @@
         "x86_64-linux"
       ];
       imports = [
+        inputs.devshell.flakeModule
         ./flakeModules/default.nix
+        ./flakeModules/ethereum-development/default.nix
         ./nixosModules/default.nix
         ./packages/default.nix
         ./tools/default.nix
         ./docs/default.nix
         ./templates/default.nix
         ./flakeModules/valence-contracts.nix
       ];
+      
+      perSystem = {
+        pkgs,
+        inputs',
+        ...
+      }: {
+        # Enable ethereum development environment
+        ethereum-development.enable = true;
+        ethereum-development.network = "sepolia";
+      };
     };
 
   inputs = {
@@ -33,6 +45,7 @@
     flake-parts.url = "github:hercules-ci/flake-parts";
     crane.url = "github:ipetkov/crane";
     rust-overlay.url = "github:oxalica/rust-overlay";
+    devshell.url = "github:numtide/devshell";
     flake-parts-website.url = "github:hercules-ci/flake.parts-website";
     # This is a flake but we just need the render module
     # Theres a lot of inputs so it would pollute the lock file if its added as a flake

flake.nix

@@ -15,5 +15,9 @@ in
       imports = [ ./valence-contracts.nix ];
       perSystem.valence-contracts = { inherit default-inputs; };
     };
+    ethereum-development = {
+      imports = [ ./ethereum-development/default.nix ];
+      perSystem.ethereum-development = { inherit default-inputs; };
+    };
   };
 }

flakeModules/default.nix

@@ -0,0 +1,74 @@
+# Ethereum development flake module for zero.nix
+# Provides development environment with ethereum tools
+{
+  lib,
+  flake-parts-lib,
+  ...
+}: let
+  inherit (flake-parts-lib) mkPerSystemOption;
+  inherit (lib) types;
+in {
+  _file = ./default.nix;
+  options = {
+    perSystem = mkPerSystemOption (
+      {
+        config,
+        pkgs,
+        self',
+        system,
+        options,
+        ...
+      }: let
+        cfg = config.ethereum-development;
+      in {
+        options = {
+          ethereum-development.enable = lib.mkEnableOption "ethereum development environment";
+          
+          ethereum-development.network = lib.mkOption {
+            type = lib.types.enum [ "mainnet" "goerli" "sepolia" "holesky" ];
+            default = "sepolia";
+            description = "Default ethereum network for development";
+          };
+        };
+        
+        config = lib.mkIf cfg.enable (lib.optionalAttrs (options ? devshells) {
+          devshells.ethereum = {
+            name = "ethereum-development";
+            
+            commands = [
+              {
+                package = self'.packages.geth;
+                help = "Ethereum execution client";
+              }
+              {
+                package = self'.packages.lighthouse;
+                help = "Ethereum consensus client";
+              }
+              {
+                package = pkgs.curl;
+                help = "HTTP client for API testing";
+              }
+              {
+                package = pkgs.jq;
+                help = "JSON processor for API responses";
+              }
+              {
+                package = pkgs.openssl;
+                help = "SSL/TLS toolkit";
+              }
+            ];
+            
+            motd = ''
+              {14}{bold}Ethereum development environment{reset}
+              {9}Network: ${cfg.network}{reset}
+              
+              {13}Quick start:{reset}
+                geth ${if cfg.network == "mainnet" then "" else "--${cfg.network}"} --datadir ./data/geth --http --ws
+                lighthouse bn --network ${if cfg.network == "mainnet" then "mainnet" else cfg.network} --datadir ./data/lighthouse
+            '';
+          };
+        });
+      }
+    );
+  };
+} 

flakeModules/ethereum-development/default.nix

@@ -16,5 +16,11 @@
         zero-nix = self';
       }
     );
+    ethereum-node = moduleWithSystem (
+      {self', ... }:
+      import ./ethereum-node {
+        zero-nix = self';
+      }
+    );
   };
 }