Skip to content

Commit f2bb1ef

Browse files
authored
nixos/geth: add sepolia, remove obsolete networks, fix license (#378301)
2 parents 92bd2f0 + cd1cf64 commit f2bb1ef

File tree

3 files changed

+26
-8
lines changed

3 files changed

+26
-8
lines changed

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,8 @@ let
126126
network = lib.mkOption {
127127
type = lib.types.nullOr (
128128
lib.types.enum [
129-
"goerli"
130129
"holesky"
131-
"rinkeby"
132-
"yolov2"
133-
"ropsten"
130+
"sepolia"
134131
]
135132
);
136133
default = null;

nixos/tests/geth.nix

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ import ./make-test-python.nix (
1515
enable = true;
1616
};
1717
};
18-
services.geth."testnet" = {
18+
19+
services.geth."holesky" = {
1920
enable = true;
2021
port = 30304;
2122
network = "holesky";
@@ -28,15 +29,31 @@ import ./make-test-python.nix (
2829
port = 18551;
2930
};
3031
};
32+
33+
services.geth."sepolia" = {
34+
enable = true;
35+
port = 30305;
36+
network = "sepolia";
37+
http = {
38+
enable = true;
39+
port = 28545;
40+
};
41+
authrpc = {
42+
enable = true;
43+
port = 28551;
44+
};
45+
};
3146
};
3247

3348
testScript = ''
3449
start_all()
3550
3651
machine.wait_for_unit("geth-mainnet.service")
37-
machine.wait_for_unit("geth-testnet.service")
52+
machine.wait_for_unit("geth-holesky.service")
53+
machine.wait_for_unit("geth-sepolia.service")
3854
machine.wait_for_open_port(8545)
3955
machine.wait_for_open_port(18545)
56+
machine.wait_for_open_port(28545)
4057
4158
machine.succeed(
4259
'geth attach --exec "eth.blockNumber" http://localhost:8545 | grep \'^0$\' '
@@ -45,6 +62,10 @@ import ./make-test-python.nix (
4562
machine.succeed(
4663
'geth attach --exec "eth.blockNumber" http://localhost:18545 | grep \'^0$\' '
4764
)
65+
66+
machine.succeed(
67+
'geth attach --exec "eth.blockNumber" http://localhost:28545 | grep \'^0$\' '
68+
)
4869
'';
4970
}
5071
)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ buildGoModule rec {
7272
homepage = "https://geth.ethereum.org/";
7373
description = "Official golang implementation of the Ethereum protocol";
7474
license = with licenses; [
75-
lgpl3Plus
76-
gpl3Plus
75+
lgpl3Only
76+
gpl3Only
7777
];
7878
maintainers = with maintainers; [ RaghavSood ];
7979
mainProgram = "geth";

0 commit comments

Comments
 (0)