From c708f2f92a5bd04b14f58c0d8ab9772d2bc41f96 Mon Sep 17 00:00:00 2001 From: David Terry Date: Thu, 27 May 2021 14:53:59 +0200 Subject: [PATCH 1/2] turbo-geth: rename to erigon --- .../blockchains/{turbo-geth/default.nix => erigon.nix} | 0 pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/applications/blockchains/{turbo-geth/default.nix => erigon.nix} (100%) diff --git a/pkgs/applications/blockchains/turbo-geth/default.nix b/pkgs/applications/blockchains/erigon.nix similarity index 100% rename from pkgs/applications/blockchains/turbo-geth/default.nix rename to pkgs/applications/blockchains/erigon.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5af6ed97f140..fb151723373f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28840,6 +28840,8 @@ with pkgs; ergo = callPackage ../applications/blockchains/ergo { }; + erigon = callPackage ../applications/blockchains/erigon.nix { }; + exodus = callPackage ../applications/blockchains/exodus { }; faraday = callPackage ../applications/blockchains/faraday { }; @@ -28911,8 +28913,6 @@ with pkgs; tessera = callPackage ../applications/blockchains/tessera { }; - turbo-geth = callPackage ../applications/blockchains/turbo-geth { }; - vertcoin = libsForQt514.callPackage ../applications/blockchains/vertcoin { boost = boost165; withGui = true; From a74eaeba5a3b5ba416c848929930045ddda914e4 Mon Sep 17 00:00:00 2001 From: David Terry Date: Tue, 8 Jun 2021 15:41:43 +0200 Subject: [PATCH 2/2] erigon: 2021.05.02 -> 2021.08.01 --- .../from_md/release-notes/rl-2111.section.xml | 7 +++++++ .../manual/release-notes/rl-2111.section.md | 2 ++ pkgs/applications/blockchains/erigon.nix | 20 +++++++++++-------- pkgs/top-level/aliases.nix | 1 + 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 27175564e9d0..6c1e73884b95 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -167,6 +167,13 @@ from 1.0.4 to 3.0.1 + + + The erigon ethereum node has moved to a new + database format in 2021-05-04, and requires + a full resync + + services.geoip-updater was broken and has diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 8596cea10d7e..6fdec708a6fb 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -52,6 +52,8 @@ pt-services.clipcat.enable). - The `staticjinja` package has been upgraded from 1.0.4 to 3.0.1 +- The `erigon` ethereum node has moved to a new database format in `2021-05-04`, and requires a full resync + - `services.geoip-updater` was broken and has been replaced by [services.geoipupdate](options.html#opt-services.geoipupdate.enable). - PHP 7.3 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 21.11 release. diff --git a/pkgs/applications/blockchains/erigon.nix b/pkgs/applications/blockchains/erigon.nix index 58c0b45337eb..0d6a395b05af 100644 --- a/pkgs/applications/blockchains/erigon.nix +++ b/pkgs/applications/blockchains/erigon.nix @@ -1,29 +1,33 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { - pname = "turbo-geth"; - version = "2021.05.02"; + pname = "erigon"; + version = "2021.08.01"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7sTRAAlKZOdwi/LRbIEDKWpBe1ol8pZfEf2KIC4s0xk="; + sha256 = "sha256-fjMkCCeQa/IHB4yXlL7Qi8J9wtZm90l3xIA72LeoW8M="; }; - vendorSha256 = "1d0ahdb2b5v8nxq3kdxw151phnyv6habb8kr8qjaq3kyhcnyk6ng"; + vendorSha256 = "1vsgd19an592dblm9afasmh8cd0x2frw5pvnxkxd2fikhy2mibbs"; runVend = true; + # Build errors in mdbx when format hardening is enabled: + # cc1: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security] + hardeningDisable = [ "format" ]; + subPackages = [ - "cmd/tg" + "cmd/erigon" "cmd/evm" "cmd/rpcdaemon" "cmd/rlpdump" ]; meta = with lib; { - homepage = "https://github.com/ledgerwatch/turbo-geth/"; - description = "Ethereum node and geth fork focused on scalability and modularity"; + homepage = "https://github.com/ledgerwatch/erigon/"; + description = "Ethereum node implementation focused on scalability and modularity"; license = with licenses; [ lgpl3Plus gpl3Plus ]; maintainers = with maintainers; [ d-xo ]; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ae0194850666..d7d4b0dd8c21 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -874,6 +874,7 @@ mapAliases ({ truecrypt = veracrypt; # added 2018-10-24 tshark = wireshark-cli; # added 2018-04-25 tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # added 2021-03-07 + turbo-geth = throw "turbo-geth has been renamed to erigon"; # added 20201-08-08 uberwriter = apostrophe; # added 2020-04-23 ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21 ucsFonts = ucs-fonts; # added 2016-07-15