diff --git a/nixos/modules/services/blockchain/ethereum/geth.nix b/nixos/modules/services/blockchain/ethereum/geth.nix index 0c406c595a74..570c556ef849 100644 --- a/nixos/modules/services/blockchain/ethereum/geth.nix +++ b/nixos/modules/services/blockchain/ethereum/geth.nix @@ -126,11 +126,8 @@ let network = lib.mkOption { type = lib.types.nullOr ( lib.types.enum [ - "goerli" "holesky" - "rinkeby" - "yolov2" - "ropsten" + "sepolia" ] ); default = null; diff --git a/nixos/tests/geth.nix b/nixos/tests/geth.nix index 984b46935b86..7fa7b97ed3bb 100644 --- a/nixos/tests/geth.nix +++ b/nixos/tests/geth.nix @@ -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$\' ' + ) ''; } ) diff --git a/pkgs/by-name/go/go-ethereum/package.nix b/pkgs/by-name/go/go-ethereum/package.nix index bd9a740f73d4..abff2184e684 100644 --- a/pkgs/by-name/go/go-ethereum/package.nix +++ b/pkgs/by-name/go/go-ethereum/package.nix @@ -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";