From a67fa5f4a4689029fde6de3184cf72203ecf50c8 Mon Sep 17 00:00:00 2001
From: Paul Hauner <paul@paulhauner.com>
Date: Wed, 7 Oct 2020 10:10:35 +0000
Subject: [PATCH] Add zinken testnet (#1741)

## Issue Addressed

- Resolves #1722

## Proposed Changes

This extends @danielschonfeld's work in #1739 with:

- Use an empty boot node list
- Remove the genesis state

## Additional Info

NA


Co-authored-by: Daniel Schonfeld <daniel@schonfeld.org>
---
 common/eth2_config/src/lib.rs                 |   2 ++
 common/eth2_testnet_config/build.rs           |   3 ++-
 common/eth2_testnet_config/src/lib.rs         |   7 +++++--
 common/eth2_testnet_config/testnet_zinken.zip | Bin 0 -> 1485 bytes
 lighthouse/src/main.rs                        |   2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 common/eth2_testnet_config/testnet_zinken.zip

diff --git a/common/eth2_config/src/lib.rs b/common/eth2_config/src/lib.rs
index 6ec5a21625..9696ac1d3c 100644
--- a/common/eth2_config/src/lib.rs
+++ b/common/eth2_config/src/lib.rs
@@ -111,6 +111,8 @@ define_net!(medalla, include_medalla_file, "medalla", true);
 
 define_net!(spadina, include_spadina_file, "spadina", true);
 
+define_net!(zinken, include_zinken_file, "zinken", false);
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/common/eth2_testnet_config/build.rs b/common/eth2_testnet_config/build.rs
index 588ec90a04..e9f4794d4b 100644
--- a/common/eth2_testnet_config/build.rs
+++ b/common/eth2_testnet_config/build.rs
@@ -1,6 +1,6 @@
 //! Downloads a testnet configuration from Github.
 
-use eth2_config::{altona, medalla, spadina, Eth2NetArchiveAndDirectory};
+use eth2_config::{altona, medalla, spadina, zinken, Eth2NetArchiveAndDirectory};
 use std::fs;
 use std::fs::File;
 use std::io;
@@ -10,6 +10,7 @@ const ETH2_NET_DIRS: &[Eth2NetArchiveAndDirectory<'static>] = &[
     altona::ETH2_NET_DIR,
     medalla::ETH2_NET_DIR,
     spadina::ETH2_NET_DIR,
+    zinken::ETH2_NET_DIR,
 ];
 
 fn main() {
diff --git a/common/eth2_testnet_config/src/lib.rs b/common/eth2_testnet_config/src/lib.rs
index 1b0d4a933a..37d532145b 100644
--- a/common/eth2_testnet_config/src/lib.rs
+++ b/common/eth2_testnet_config/src/lib.rs
@@ -7,7 +7,9 @@
 //!
 //! https://github.com/sigp/lighthouse/pull/605
 //!
-use eth2_config::{include_altona_file, include_medalla_file, include_spadina_file, unique_id};
+use eth2_config::{
+    include_altona_file, include_medalla_file, include_spadina_file, include_zinken_file, unique_id,
+};
 
 use enr::{CombinedKey, Enr};
 use ssz::{Decode, Encode};
@@ -54,8 +56,9 @@ macro_rules! define_net {
 const ALTONA: HardcodedNet = define_net!(altona, include_altona_file);
 const MEDALLA: HardcodedNet = define_net!(medalla, include_medalla_file);
 const SPADINA: HardcodedNet = define_net!(spadina, include_spadina_file);
+const ZINKEN: HardcodedNet = define_net!(zinken, include_zinken_file);
 
-const HARDCODED_NETS: &[HardcodedNet] = &[ALTONA, MEDALLA, SPADINA];
+const HARDCODED_NETS: &[HardcodedNet] = &[ALTONA, MEDALLA, SPADINA, ZINKEN];
 pub const DEFAULT_HARDCODED_TESTNET: &str = "medalla";
 
 /// Specifies an Eth2 testnet.
diff --git a/common/eth2_testnet_config/testnet_zinken.zip b/common/eth2_testnet_config/testnet_zinken.zip
new file mode 100644
index 0000000000000000000000000000000000000000..f81975f66c7dbe43c6bc95f3e8b088370e1c5fbc
GIT binary patch
literal 1485
zcmWIWW@h1H00Ew6_du6R83oKhHVE@F$S@@3=a<B%<`wBxCg$dZhHx@4a|G7Lvj)}1
zmsW5yFtWS=Dg+bJv0MQ_lSF{}I2g{!xCi#H@O{V$lyzihVBiLtl$@WJmYI$)r)6$U
zJOidVxgn?XZW{>f`K;Yj$EfPP>8Z5tIvq8Wm6N83es?<H$nV-Xr@5|n`jy+A`fV1Q
zcW*xLwK^(hPg1zW+qyr$KY#rG{WyP7YW}`U*H;(t9rz{Ivps0{<#i`IlAkf<HSQJN
zf5FVN|KgitOCFrbG@fyG%VoW#l0hw9?=QSs^)d9a<kO`Nr!uEcyt@4V%}jNN))|%i
z^gD8Q?V9$W_nnCQ_Sgn5DcLxOM$v1VPjyP`2&qLmUCwbXQCc!v#N=$Io2Kg7yH*B*
z(M;*D)7MpBH9q`z>tw$zK@E=l*>2bC4i;aMx|{X5CCn#@cV=$Ot{jW%q)6V4`!swO
zOJCvpw{)}L6{a7V<th(m9l0Lmb+=k?P4cQH!?hb_-xL`Z{M`1=(~&1QCVubRb6j^E
zW^{{e>bNU$&-}`VbZzBZ6Bx=2j@vmb6_wu+crEhPE77?rEsLeQ*RGao+bU-B#D4F>
z&2h7@FApzy%2RgM_}s>hZ(A16PmK(&SnfJcR{l$bLs$sE*W^uBGM2Sd`ZwJZe{XaD
zc$;6}jnY?NzH}evDCIruGiRnu*EWA~u01Rvt67gujJS}VtRIs4fXlye*}_%Mb>;?U
z*ShNZe$1P*^y}UNUh_4_H8XgxJjzWtb4*5M_u^eT?yR$w_`9bsF^q51J^Ic4;tIDi
z#TzMeCM0$|`^$CH&6xYZ-YdVRnjWY~XnSR|Kkc<;$KJgUwI1wvwEcojRkV_cMf<G|
zE@LAr4;!_o0=YN$TfW{r;m}?6g@t{yHt3udotea<V<EZpffI-5cdHxQ8?v9g^A8I5
z%Db`A;L_o<5rxaHZZ=juRqJ)gZ@Y#jU%PYH?9ES_Ubm(c&)3|d^I1hRC`Iha8J&A-
z9pVep7I*Y~QEXtjGtutNwFZ50wd324aVPF~?thZ~O1t8kgtg7wY3uhGFyDA<c`l}_
zLW;@6=c<@jxW^px-FJQzz7}IQ*Dd@jA;x}hS@|BNhdgr{AL^XH7~btTUt@BYhv&8_
z1yg7AdF*m^(-pjxzi{oU6DPLua2M@iSmA$t;-q}d%ZaT0LSb7z22A)5%1w}bc^#OW
zysok(a)9#|1A_oCH>IQ&<m6YzC*|ZPXX}+zlz_A5G+>tc56qruS<~3W!otMR9GpKP
zCO!n3=&U1TtPL~~ghe1G<`-v{!~^qbNl{{Q3Eb4BKvVx<nrcvCY3XL*nrvWZYGRRO
zU}5HJV&<G=U|?wJY;NIVkYt%;>1J$}>|$yRw3v}eju}@WBLQ>(0|O%vFKGm^(25*Z
zNRfl)Cy0@_N*iP&y?{odls!NLL1hnC191g7vVk*zg&Jn?15E`5KOR#t10C7aR}fRN
bL;=ubP!wR8%*qA|EfydQ0R~<&3y22*kk}c`

literal 0
HcmV?d00001

diff --git a/lighthouse/src/main.rs b/lighthouse/src/main.rs
index 376381c27d..714209b9cc 100644
--- a/lighthouse/src/main.rs
+++ b/lighthouse/src/main.rs
@@ -114,7 +114,7 @@ fn main() {
                 .long("testnet")
                 .value_name("testnet")
                 .help("Name of network lighthouse will connect to")
-                .possible_values(&["medalla", "altona", "spadina"])
+                .possible_values(&["medalla", "altona", "spadina", "zinken"])
                 .conflicts_with("testnet-dir")
                 .takes_value(true)
                 .global(true)