From 74a83c1229eb8ac38ab54a11ce103bc43e03a1b7 Mon Sep 17 00:00:00 2001
From: Kim De Mey <kim.demey@gmail.com>
Date: Thu, 20 Oct 2022 10:34:59 +0200
Subject: [PATCH] Bump nim-eth and remove all now unneeded p2p related imports
 (#1273)

---
 fluffy/data/history_data_parser.nim                   | 2 --
 hive_integration/nodocker/consensus/consensus_sim.nim | 2 +-
 nimbus/config.nim                                     | 2 +-
 nimbus/db/db_chain.nim                                | 2 +-
 nimbus/genesis.nim                                    | 2 +-
 premix/configuration.nim                              | 2 +-
 tests/test_accounts_cache.nim                         | 2 +-
 tests/test_clique/pool.nim                            | 2 +-
 tests/test_configuration.nim                          | 2 +-
 tests/test_custom_network.nim                         | 2 +-
 tests/test_sync_snap/test_types.nim                   | 2 +-
 vendor/nim-eth                                        | 2 +-
 12 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/fluffy/data/history_data_parser.nim b/fluffy/data/history_data_parser.nim
index 072338603..4f0a70c3a 100644
--- a/fluffy/data/history_data_parser.nim
+++ b/fluffy/data/history_data_parser.nim
@@ -11,8 +11,6 @@ import
   json_serialization, json_serialization/std/tables,
   stew/[byteutils, io2, results], chronicles,
   eth/[rlp, common/eth_types],
-  # TODO: `NetworkId` should not be in these private types
-  eth/p2p/private/p2p_types,
   ../../nimbus/[chain_config, genesis],
   ../network/history/[history_content, accumulator]
 
diff --git a/hive_integration/nodocker/consensus/consensus_sim.nim b/hive_integration/nodocker/consensus/consensus_sim.nim
index 8dc66e5a4..23b51dfee 100644
--- a/hive_integration/nodocker/consensus/consensus_sim.nim
+++ b/hive_integration/nodocker/consensus/consensus_sim.nim
@@ -9,7 +9,7 @@
 
 import
   std/[os, json, strutils, times],
-  eth/[common, trie/db, p2p], stew/byteutils,
+  eth/[common, trie/db], stew/byteutils,
   ../../../nimbus/db/db_chain,
   ../../../nimbus/[genesis, chain_config, conf_utils],
   ../sim_utils,
diff --git a/nimbus/config.nim b/nimbus/config.nim
index 4adf92370..435ee39c1 100644
--- a/nimbus/config.nim
+++ b/nimbus/config.nim
@@ -22,7 +22,7 @@ import
     confutils/std/net
   ],
   stew/shims/net as stewNet,
-  eth/[p2p, common, net/nat, p2p/bootnodes],
+  eth/[common, net/nat, p2p/bootnodes, p2p/enode],
   "."/[db/select_backend, chain_config,
     constants, vm_compile_info, version
   ]
diff --git a/nimbus/db/db_chain.nim b/nimbus/db/db_chain.nim
index c9692ac2a..12ec8650c 100644
--- a/nimbus/db/db_chain.nim
+++ b/nimbus/db/db_chain.nim
@@ -8,7 +8,7 @@
 import
   std/[sequtils, algorithm],
   stew/[byteutils], eth/trie/[hexary, db],
-  eth/[common, rlp, p2p], chronicles,
+  eth/[common, rlp], chronicles,
   ".."/[errors, constants, utils, chain_config],
   "."/storage_types
 
diff --git a/nimbus/genesis.nim b/nimbus/genesis.nim
index 4cf77dedb..dade94b6e 100644
--- a/nimbus/genesis.nim
+++ b/nimbus/genesis.nim
@@ -1,6 +1,6 @@
 import
   std/tables,
-  eth/[common, rlp, p2p],
+  eth/[common, rlp],
   chronicles, eth/trie/[db, trie_defs],
   ./db/[db_chain, state_db],
   "."/[constants, chain_config, forks, p2p/gaslimit]
diff --git a/premix/configuration.nim b/premix/configuration.nim
index 1eb3816a4..eb86f7a9e 100644
--- a/premix/configuration.nim
+++ b/premix/configuration.nim
@@ -1,6 +1,6 @@
 import
   std/[os, parseopt, strutils],
-  eth/p2p, stint, ../nimbus/config
+  eth/common, stint, ../nimbus/config
 
 from ../nimbus/chain_config import
   MainNet,
diff --git a/tests/test_accounts_cache.nim b/tests/test_accounts_cache.nim
index b1e25c622..58ad50fb2 100644
--- a/tests/test_accounts_cache.nim
+++ b/tests/test_accounts_cache.nim
@@ -17,7 +17,7 @@ import
   ../nimbus/vm_state,
   ../nimbus/vm_types,
   ./replay/undump_blocks,
-  eth/[common, p2p, trie/db],
+  eth/[common, trie/db],
   unittest2
 
 type
diff --git a/tests/test_clique/pool.nim b/tests/test_clique/pool.nim
index 59fe98a27..6793666ba 100644
--- a/tests/test_clique/pool.nim
+++ b/tests/test_clique/pool.nim
@@ -10,7 +10,7 @@
 
 import
   std/[algorithm, random, sequtils, strformat, strutils, tables, times],
-  eth/[common, keys, p2p, rlp, trie/db],
+  eth/[common, keys, rlp, trie/db],
   ethash,
   secp256k1/abi,
   stew/objects,
diff --git a/tests/test_configuration.nim b/tests/test_configuration.nim
index 50cbe4a13..5a51d10ab 100644
--- a/tests/test_configuration.nim
+++ b/tests/test_configuration.nim
@@ -1,7 +1,7 @@
 import
   std/[os],
   pkg/[unittest2],
-  eth/[p2p, common, keys],
+  eth/[common, keys],
   stew/byteutils,
   ../nimbus/[config, chain_config, context],
   ./test_helpers
diff --git a/tests/test_custom_network.nim b/tests/test_custom_network.nim
index 3f33de053..b1907d17d 100644
--- a/tests/test_custom_network.nim
+++ b/tests/test_custom_network.nim
@@ -34,7 +34,7 @@ import
   ../nimbus/p2p/chain,
   ./replay/[undump_blocks, pp],
   chronicles,
-  eth/[common, p2p, trie/db],
+  eth/[common, trie/db],
   stew/results,
   unittest2
 
diff --git a/tests/test_sync_snap/test_types.nim b/tests/test_sync_snap/test_types.nim
index d89d4e9cc..5b32ada58 100644
--- a/tests/test_sync_snap/test_types.nim
+++ b/tests/test_sync_snap/test_types.nim
@@ -10,7 +10,7 @@
 # distributed except according to those terms.
 
 import
-  eth/p2p
+  eth/common
 
 type
   AccountsSample* = object
diff --git a/vendor/nim-eth b/vendor/nim-eth
index cc52ef35e..fef47331c 160000
--- a/vendor/nim-eth
+++ b/vendor/nim-eth
@@ -1 +1 @@
-Subproject commit cc52ef35e4893d6dddd4b1d776e6b8a56f2d945c
+Subproject commit fef47331c37ee8abb8608037222658737ff498a6