Unverified Commit f2bb1efa authored by asymmetric's avatar asymmetric Committed by GitHub
Browse files

nixos/geth: add sepolia, remove obsolete networks, fix license (#378301)

parents 92bd2f06 cd1cf641

nixos/modules/services/blockchain/ethereum/geth.nix

+1 −4
Original line number Diff line number Diff line
@@ -126,11 +126,8 @@ let 
        network = lib.mkOption {

          type = lib.types.nullOr (

            lib.types.enum [

              "goerli"

              "holesky"

              "rinkeby"

              "yolov2"

              "ropsten"

              "sepolia"

            ]

          );

          default = null;

nixos/tests/geth.nix

+23 −2
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ import ./make-test-python.nix ( 
            enable = true;

          };

        };

        services.geth."testnet" = {



        services.geth."holesky" = {

          enable = true;

          port = 30304;

          network = "holesky";
@@ -28,15 +29,31 @@ import ./make-test-python.nix ( 
            port = 18551;

          };

        };



        services.geth."sepolia" = {

          enable = true;

          port = 30305;

          network = "sepolia";

          http = {

            enable = true;

            port = 28545;

          };

          authrpc = {

            enable = true;

            port = 28551;

          };

        };

      };



    testScript = ''

      start_all()



      machine.wait_for_unit("geth-mainnet.service")

      machine.wait_for_unit("geth-testnet.service")

      machine.wait_for_unit("geth-holesky.service")

      machine.wait_for_unit("geth-sepolia.service")

      machine.wait_for_open_port(8545)

      machine.wait_for_open_port(18545)

      machine.wait_for_open_port(28545)



      machine.succeed(

          'geth attach --exec "eth.blockNumber" http://localhost:8545 | grep \'^0$\' '
@@ -45,6 +62,10 @@ import ./make-test-python.nix ( 
      machine.succeed(

          'geth attach --exec "eth.blockNumber" http://localhost:18545 | grep \'^0$\' '

      )



      machine.succeed(

          'geth attach --exec "eth.blockNumber" http://localhost:28545 | grep \'^0$\' '

      )

    '';

  }

)

pkgs/by-name/go/go-ethereum/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -72,8 +72,8 @@ buildGoModule rec { 
    homepage = "https://geth.ethereum.org/";

    description = "Official golang implementation of the Ethereum protocol";

    license = with licenses; [

      lgpl3Plus

      gpl3Plus

      lgpl3Only

      gpl3Only

    ];

    maintainers = with maintainers; [ RaghavSood ];

    mainProgram = "geth";