From 6d47d96c8447dd55c9b1d5a6df17b8aad2b048f4 Mon Sep 17 00:00:00 2001
From: Jacek Sieka <jacek@status.im>
Date: Fri, 27 Aug 2021 18:54:51 +0200
Subject: [PATCH] altair upgrade for prater (#2828)

and a few import fixes for free
---
 beacon_chain/networking/eth2_network.nim      | 24 +++++++------------
 .../validators/keystore_management.nim        |  2 +-
 vendor/eth2-networks                          |  2 +-
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/beacon_chain/networking/eth2_network.nim b/beacon_chain/networking/eth2_network.nim
index a261b612f..519e14bcf 100644
--- a/beacon_chain/networking/eth2_network.nim
+++ b/beacon_chain/networking/eth2_network.nim
@@ -9,25 +9,19 @@
 
 import
   # Std lib
-  std/[typetraits, sequtils, os, algorithm, math, sets],
-  std/options as stdOptions,
+  std/[typetraits, os, sequtils, algorithm, math, tables],
 
   # Status libs
-  stew/[leb128, base58, endians2, results, byteutils, io2, bitops2], bearssl,
+  stew/[leb128, endians2, results, byteutils, io2, bitops2], bearssl,
   stew/shims/net as stewNet,
-  stew/shims/[macros, tables],
+  stew/shims/[macros],
   faststreams/[inputs, outputs, buffers], snappy, snappy/framing,
-  json_serialization, json_serialization/std/[net, options],
+  json_serialization, json_serialization/std/[net, sets, options],
   chronos, chronicles, metrics,
-  libp2p/[switch, peerinfo, multicodec,
-          multiaddress, crypto/crypto, crypto/secp,
-          protocols/identify, protocols/protocol,
-          builders],
-  libp2p/muxers/muxer, libp2p/muxers/mplex/mplex,
-  libp2p/transports/[transport, tcptransport],
-  libp2p/protocols/secure/[secure, noise],
-  libp2p/protocols/pubsub/[pubsub, gossipsub, rpc/message, rpc/messages, peertable, pubsubpeer],
-  libp2p/transports/tcptransport,
+  libp2p/[switch, peerinfo, multiaddress, multicodec, crypto/crypto,
+    crypto/secp, builders],
+  libp2p/protocols/pubsub/[
+      pubsub, gossipsub, rpc/message, rpc/messages, peertable, pubsubpeer],
   libp2p/stream/connection,
   libp2p/utils/semaphore,
   eth/[keys, async_utils], eth/p2p/p2p_protocol_dsl,
@@ -42,7 +36,7 @@ when chronicles.enabledLogLevel == LogLevel.TRACE:
   import std/sequtils
 
 export
-  version, multiaddress, peer_pool, peerinfo, p2pProtocol, connection,
+  tables, version, multiaddress, peer_pool, peerinfo, p2pProtocol, connection,
   libp2p_json_serialization, eth2_ssz_serialization, results, eth2_discovery
 
 logScope:
diff --git a/beacon_chain/validators/keystore_management.nim b/beacon_chain/validators/keystore_management.nim
index 2f3119cc5..6e800f1b4 100644
--- a/beacon_chain/validators/keystore_management.nim
+++ b/beacon_chain/validators/keystore_management.nim
@@ -9,7 +9,7 @@
 
 import
   std/[os, strutils, terminal, wordwrap, unicode],
-  chronicles, chronos, web3, stint, json_serialization, zxcvbn,
+  chronicles, chronos, json_serialization, zxcvbn,
   serialization, blscurve, eth/common/eth_types, eth/keys, confutils, bearssl,
   ../spec/[eth2_merkleization, keystore],
   ../spec/datatypes/base,
diff --git a/vendor/eth2-networks b/vendor/eth2-networks
index 9eeb9e33e..7fa1b8689 160000
--- a/vendor/eth2-networks
+++ b/vendor/eth2-networks
@@ -1 +1 @@
-Subproject commit 9eeb9e33e10e9deb1439dd6aa4563c1d73c85a63
+Subproject commit 7fa1b868985ee24aad65567f9250cf7fa86f97b1