added prototype geth as l2 in devnet

devnet/default.nix

@@ -23,7 +23,7 @@
 
     # L2
     op-batcher = lib.getExe self'.packages.op-batcher-v1_11_4;
-    op-geth = lib.getExe self'.packages.op-geth-v1_101500_1;
+    op-geth = lib.getExe' inputs.op-geth.packages.${pkgs.system}.default "geth"; #self'.packages.op-geth-v1_101500_1;
     op-node = lib.getExe self'.packages.op-node-v1_11_2;
     op-proposer = lib.getExe self'.packages.op-proposer-v1_10_0;
 

flake.nix

@@ -15,6 +15,8 @@
       url = "github:numtide/treefmt-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    op-geth.url = "git+ssh://git@github.com/Golem-base/op-geth";
   };
 
   outputs = inputs @ {flake-parts, ...}:
@@ -30,6 +32,9 @@
         ./devnet
       ];
 
-      systems = ["x86_64-linux"];
+      systems = [
+        "x86_64-linux"
+        "aarch64-darwin"
+      ];
     };
 }

packages/contracts-bedrock/v1_8_0.nix

@@ -72,6 +72,5 @@ in
       description = "Optimism is Ethereum, scaled.";
       homepage = "https://optimism.io/";
       license = with licenses; [mit];
-      platforms = ["x86_64-linux"];
     };
   }

packages/default.nix

@@ -6,7 +6,6 @@ _: {
       bls = callPackage ./prysm/bls.nix {};
       blst = callPackage ./prysm/blst.nix {};
       prysm = callPackage ./prysm {inherit bls blst;};
-      kurtosis = callPackage ./kurtosis {};
       dora = callPackage ./dora {};
 
       eth2-testnet-genesis = callPackage ./eth2-testnet-genesis {inherit bls;};

packages/dora/default.nix

@@ -3,33 +3,62 @@
   stdenv,
   fetchurl,
   autoPatchelfHook,
-}:
-stdenv.mkDerivation rec {
-  pname = "dora";
+}: let
   version = "1.14.0";
 
-  nativeBuildInputs = [autoPatchelfHook];
+  platforms = {
+    "x86_64-linux" = {
+      name = "linux_amd64";
+      sha256 = "sha256-RjqoCluPzXc214m3IKh09Aw0+scGqQpC2HCLteAtnMc=";
+    };
 
-  src = fetchurl {
-    url = "https://github.com/ethpandaops/dora/releases/download/v${version}/dora_${version}_linux_amd64.tar.gz";
-    sha256 = "sha256-RjqoCluPzXc214m3IKh09Aw0+scGqQpC2HCLteAtnMc=";
-  };
+    "aarch64-linux" = {
+      name = "linux_arm64";
+      sha256 = "0vdyc8d2my15l7qa7v272k23vr31rbg35p9pw015r7d7hqm7xjr8";
+    };
+
+    "x86_64-darwin" = {
+      name = "darwin_amd64";
+      sha256 = "1w82bp1hs59yw88s7r6r6mlsq3i7jdpl3v89lzh8nkmjcrgm3vbf";
+    };
 
-  unpackPhase = ''
-    tar -xzf $src
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp dora-explorer $out/bin/
-    chmod +x $out/bin/dora-explorer
-  '';
-
-  meta = with lib; {
-    description = "Dora the Explorer is a lightweight slot explorer for the ethereum beaconchain ";
-    homepage = "https://github.com/ethpandaops/dora";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    mainProgram = "dora-explorer";
+    "aarch64-darwin" = {
+      name = "darwin_arm64";
+      sha256 = "13bb4gw7y2zdyvpmv4fcpvb3b5nmxhk80amwaw2w06qm3ck6112b";
+    };
   };
-}
+
+  src = let
+    inherit (builtins.getAttr stdenv.hostPlatform.system platforms) name sha256;
+  in
+    fetchurl {
+      url = "https://github.com/ethpandaops/dora/releases/download/v${version}/dora_${version}_${name}.tar.gz";
+      inherit sha256;
+    };
+in
+  stdenv.mkDerivation {
+    inherit src version;
+    pname = "dora";
+
+    nativeBuildInputs =
+      if stdenv.hostPlatform.system == "x86_64-linux"
+      then [autoPatchelfHook]
+      else [];
+
+    unpackPhase = ''
+      tar -xzf $src
+    '';
+
+    installPhase = ''
+      mkdir -p $out/bin
+      cp dora-explorer $out/bin/
+      chmod +x $out/bin/dora-explorer
+    '';
+
+    meta = with lib; {
+      description = "Dora the Explorer is a lightweight slot explorer for the ethereum beaconchain ";
+      homepage = "https://github.com/ethpandaops/dora";
+      license = licenses.gpl3;
+      mainProgram = "dora-explorer";
+    };
+  }

packages/eth2-testnet-genesis/default.nix

@@ -29,6 +29,9 @@ buildGoModule rec {
     description = "Create a genesis state for an Eth2 testnet";
     homepage = "https://github.com/protolambda/eth2-testnet-genesis";
     mainProgram = "eth2-testnet-genesis";
-    platforms = ["x86_64-linux"];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-darwin"
+    ];
   };
 }

packages/op-batcher/default.nix

@@ -38,6 +38,9 @@ buildGoModule rec {
     homepage = "https://optimism.io/";
     license = with licenses; [mit];
     mainProgram = "op-batcher";
-    platforms = ["x86_64-linux"];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-darwin"
+    ];
   };
 }

packages/op-batcher/op-batcher-v1_11_4.nix

@@ -6,7 +6,7 @@
   ...
 }:
 buildGoModule rec {
-  pname = "op-node";
+  pname = "op-batcher";
   version = "1.11.4";
 
   src = fetchFromGitHub {
@@ -38,6 +38,9 @@ buildGoModule rec {
     homepage = "https://optimism.io/";
     license = with licenses; [mit];
     mainProgram = "op-batcher";
-    platforms = ["x86_64-linux"];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-darwin"
+    ];
   };
 }

packages/op-node/default.nix

@@ -38,6 +38,9 @@ buildGoModule rec {
     homepage = "https://optimism.io/";
     license = with licenses; [mit];
     mainProgram = "op-node";
-    platforms = ["x86_64-linux"];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-darwin"
+    ];
   };
 }

packages/op-node/op-node-v1_11_2.nix

@@ -38,6 +38,9 @@ buildGoModule rec {
     homepage = "https://optimism.io/";
     license = with licenses; [mit];
     mainProgram = "op-node";
-    platforms = ["x86_64-linux"];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-darwin"
+    ];
   };
 }

packages/op-proposer/default.nix

@@ -38,6 +38,9 @@ buildGoModule rec {
     homepage = "https://optimism.io/";
     license = with licenses; [mit];
     mainProgram = "op-proposer";
-    platforms = ["x86_64-linux"];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-darwin"
+    ];
   };
 }

packages/op-proposer/op-proposer-v1_10_0.nix

@@ -38,6 +38,9 @@ buildGoModule rec {
     homepage = "https://optimism.io/";
     license = with licenses; [mit];
     mainProgram = "op-proposer";
-    platforms = ["x86_64-linux"];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-darwin"
+    ];
   };
 }

packages/prysm/blst.nix

@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
+      "aarch64-darwin"
     ];
   };
 }

packages/prysm/builder.sh

@@ -8,11 +8,12 @@ buildPhase() {
 }
 
 installPhase() {
-  mkdir -p "$out"/{include/elf,lib}
+  mkdir -p "$out"/{include/elf,include/mach-o,lib,}
   cp libblst.a "$out"/lib/
   cp bindings/*.{h,hpp} "$out"/include/
   cp build/assembly.S "$out"/include/
   cp build/elf/* "$out"/include/elf/
+  cp build/mach-o/* "$out"/include/mach-o/
   cp src/*.h "$out"/include/
   cp src/*.c "$out"/include/
 }

packages/prysm/default.nix

@@ -47,6 +47,7 @@ buildGo123Module rec {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
+      "aarch64-darwin"
     ];
   };
 }

shell.nix

@@ -17,7 +17,6 @@ _: {
         self'.packages.op-proposer-v1_10_0
         self'.packages.prysm
         self'.packages.eth2-testnet-genesis
-        self'.packages.kurtosis
         self'.packages.dora
         self'.packages.op-deployer-v0_2_0_rc1
       ];