From 76bb7520f3ecd5f420c0b338f088afc033c4d0c8 Mon Sep 17 00:00:00 2001
From: Hanno Cornelius <68783915+jm-clius@users.noreply.github.com>
Date: Wed, 11 Jan 2023 08:06:30 +0200
Subject: [PATCH] chore: update submodules (#1480)

* chore: switch to nim-eth master branch

* chore: updated submodules

* fix: submodule without error handling

* fix: autonat client
---
 .gitmodules                            |  2 +-
 apps/wakunode2/wakunode2_setup_rpc.nim | 16 ++++++++--------
 tests/v2/test_waku_switch.nim          |  4 ++--
 vendor/nim-bearssl                     |  2 +-
 vendor/nim-chronos                     |  2 +-
 vendor/nim-confutils                   |  2 +-
 vendor/nim-eth                         |  2 +-
 vendor/nim-faststreams                 |  2 +-
 vendor/nim-http-utils                  |  2 +-
 vendor/nim-json-rpc                    |  2 +-
 vendor/nim-json-serialization          |  2 +-
 vendor/nim-libp2p                      |  2 +-
 vendor/nim-metrics                     |  2 +-
 vendor/nim-presto                      |  2 +-
 vendor/nim-regex                       |  2 +-
 vendor/nim-serialization               |  2 +-
 vendor/nim-sqlite3-abi                 |  2 +-
 vendor/nim-stew                        |  2 +-
 vendor/nim-toml-serialization          |  2 +-
 vendor/nim-unicodedb                   |  2 +-
 vendor/nim-unittest2                   |  2 +-
 vendor/nim-web3                        |  2 +-
 vendor/nim-websock                     |  2 +-
 vendor/nimbus-build-system             |  2 +-
 vendor/nimcrypto                       |  2 +-
 vendor/zerokit                         |  2 +-
 26 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index ae8504ebe..76d0684de 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,7 +2,7 @@
 	path = vendor/nim-eth
 	url = https://github.com/status-im/nim-eth.git
 	ignore = dirty
-	branch = selectable-protocol-id
+	branch = master
 [submodule "vendor/nim-secp256k1"]
 	path = vendor/nim-secp256k1
 	url = https://github.com/status-im/nim-secp256k1.git
diff --git a/apps/wakunode2/wakunode2_setup_rpc.nim b/apps/wakunode2/wakunode2_setup_rpc.nim
index 7eaa320a0..99ed2e14b 100644
--- a/apps/wakunode2/wakunode2_setup_rpc.nim
+++ b/apps/wakunode2/wakunode2_setup_rpc.nim
@@ -25,12 +25,12 @@ logScope:
 
 
 proc startRpcServer*(node: WakuNode, rpcIp: ValidIpAddress, rpcPort: Port, conf: WakuNodeConf)
-  {.raises: [RpcBindError].} =
+  {.raises: [CatchableError].} =
 
   let
     ta = initTAddress(rpcIp, rpcPort)
     rpcServer = newRpcHttpServer([ta])
-  
+
   installDebugApiHandlers(node, rpcServer)
 
   # TODO: Move to setup protocols proc
@@ -39,21 +39,21 @@ proc startRpcServer*(node: WakuNode, rpcIp: ValidIpAddress, rpcPort: Port, conf:
     installRelayApiHandlers(node, rpcServer, topicCache)
 
     if conf.rpcPrivate:
-      # Private API access allows WakuRelay functionality that 
+      # Private API access allows WakuRelay functionality that
       # is backwards compatible with Waku v1.
       installPrivateApiHandlers(node, rpcServer, topicCache)
-  
+
   # TODO: Move to setup protocols proc
   if conf.filternode != "":
     let messageCache = newTable[ContentTopic, seq[WakuMessage]]()
     installFilterApiHandlers(node, rpcServer, messageCache)
-  
+
   # TODO: Move to setup protocols proc
   if conf.storenode != "":
     installStoreApiHandlers(node, rpcServer)
-  
+
   if conf.rpcAdmin:
     installAdminApiHandlers(node, rpcServer)
-  
+
   rpcServer.start()
-  info "RPC Server started", address=ta
\ No newline at end of file
+  info "RPC Server started", address=ta
diff --git a/tests/v2/test_waku_switch.nim b/tests/v2/test_waku_switch.nim
index d56536876..abd0ac801 100644
--- a/tests/v2/test_waku_switch.nim
+++ b/tests/v2/test_waku_switch.nim
@@ -4,7 +4,7 @@ import
   testutils/unittests,
   chronos,
   libp2p,
-  libp2p/protocols/connectivity/autonat,
+  libp2p/protocols/connectivity/autonat/client,
   libp2p/protocols/connectivity/relay/relay,
   libp2p/protocols/connectivity/relay/client,
   stew/byteutils
@@ -34,7 +34,7 @@ procSuite "Waku Switch":
 
     ## When
     await sourceSwitch.connect(wakuSwitch.peerInfo.peerId, wakuSwitch.peerInfo.addrs)
-    let ma = await Autonat.new(sourceSwitch).dialMe(wakuSwitch.peerInfo.peerId, wakuSwitch.peerInfo.addrs)
+    let ma = await AutonatClient.new().dialMe(sourceSwitch, wakuSwitch.peerInfo.peerId, wakuSwitch.peerInfo.addrs)
 
     ## Then
     check:
diff --git a/vendor/nim-bearssl b/vendor/nim-bearssl
index f4c4233de..a64799491 160000
--- a/vendor/nim-bearssl
+++ b/vendor/nim-bearssl
@@ -1 +1 @@
-Subproject commit f4c4233de453cb7eac0ce3f3ffad6496295f83ab
+Subproject commit a647994910904b0103a05db3a5ec1ecfc4d91a88
diff --git a/vendor/nim-chronos b/vendor/nim-chronos
index 266e2c0ed..e9f8baa6e 160000
--- a/vendor/nim-chronos
+++ b/vendor/nim-chronos
@@ -1 +1 @@
-Subproject commit 266e2c0ed26b455872bccb3ddbd316815a283659
+Subproject commit e9f8baa6ee2e21ff8e6b6c0ce0c22368cdd9e758
diff --git a/vendor/nim-confutils b/vendor/nim-confutils
index a26bfab7e..56f4db90f 160000
--- a/vendor/nim-confutils
+++ b/vendor/nim-confutils
@@ -1 +1 @@
-Subproject commit a26bfab7e5fb2f9fc018e5d778c169bc05772ee6
+Subproject commit 56f4db90f7923a4d6814837dda9f44c8955c52a4
diff --git a/vendor/nim-eth b/vendor/nim-eth
index 5c46220e7..58284ffed 160000
--- a/vendor/nim-eth
+++ b/vendor/nim-eth
@@ -1 +1 @@
-Subproject commit 5c46220e721069f8b8ac43a7ec006a599a8d33f0
+Subproject commit 58284ffeda4693d618e887f16c171a4b1c1dbb07
diff --git a/vendor/nim-faststreams b/vendor/nim-faststreams
index 6112432b3..b42daf41d 160000
--- a/vendor/nim-faststreams
+++ b/vendor/nim-faststreams
@@ -1 +1 @@
-Subproject commit 6112432b3a81d9db116cd5d64c39648881cfff29
+Subproject commit b42daf41d8eb4fbce40add6836bed838f8d85b6f
diff --git a/vendor/nim-http-utils b/vendor/nim-http-utils
index e88e231df..a85bd52ae 160000
--- a/vendor/nim-http-utils
+++ b/vendor/nim-http-utils
@@ -1 +1 @@
-Subproject commit e88e231dfcef4585fe3b2fbd9b664dbd28a88040
+Subproject commit a85bd52ae0a956983ca6b3267c72961d2ec0245f
diff --git a/vendor/nim-json-rpc b/vendor/nim-json-rpc
index 64dbf122d..c0ecb4261 160000
--- a/vendor/nim-json-rpc
+++ b/vendor/nim-json-rpc
@@ -1 +1 @@
-Subproject commit 64dbf122d7457ceabdacfb26131e929f26f15581
+Subproject commit c0ecb426131ebc2c3d11c085d749f55884f6fea6
diff --git a/vendor/nim-json-serialization b/vendor/nim-json-serialization
index e5b18fb71..a7d815ed9 160000
--- a/vendor/nim-json-serialization
+++ b/vendor/nim-json-serialization
@@ -1 +1 @@
-Subproject commit e5b18fb710c3d0167ec79f3b892f5a7a1bc6d1a4
+Subproject commit a7d815ed92f200f490c95d3cfd722089cc923ce6
diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p
index a69301f39..ba451196e 160000
--- a/vendor/nim-libp2p
+++ b/vendor/nim-libp2p
@@ -1 +1 @@
-Subproject commit a69301f39292c6bd012427e3a172a7687222fa89
+Subproject commit ba451196e8103d1cb394c2969370115d70c3dfce
diff --git a/vendor/nim-metrics b/vendor/nim-metrics
index 0a6477268..21e99a2e9 160000
--- a/vendor/nim-metrics
+++ b/vendor/nim-metrics
@@ -1 +1 @@
-Subproject commit 0a6477268e850d7bc98347b3875301524871765f
+Subproject commit 21e99a2e9d9f80e68bef65c80ef781613005fccb
diff --git a/vendor/nim-presto b/vendor/nim-presto
index 8bc34dd6f..a6c32794b 160000
--- a/vendor/nim-presto
+++ b/vendor/nim-presto
@@ -1 +1 @@
-Subproject commit 8bc34dd6f60b6bfe22049323100355671e4137a2
+Subproject commit a6c32794bf9ac04989764f2b5242fb76e4232c9c
diff --git a/vendor/nim-regex b/vendor/nim-regex
index ab9873553..66f144f93 160000
--- a/vendor/nim-regex
+++ b/vendor/nim-regex
@@ -1 +1 @@
-Subproject commit ab98735539ddd8a1eaaa795fd2ca65293c1640b3
+Subproject commit 66f144f935cc73977c61185fab15a3147bf117ff
diff --git a/vendor/nim-serialization b/vendor/nim-serialization
index 493d18b82..d77417cba 160000
--- a/vendor/nim-serialization
+++ b/vendor/nim-serialization
@@ -1 +1 @@
-Subproject commit 493d18b8292fc03aa4f835fd825dea1183f97466
+Subproject commit d77417cba6896c26287a68e6a95762e45a1b87e5
diff --git a/vendor/nim-sqlite3-abi b/vendor/nim-sqlite3-abi
index fda455cfe..b99d1fe77 160000
--- a/vendor/nim-sqlite3-abi
+++ b/vendor/nim-sqlite3-abi
@@ -1 +1 @@
-Subproject commit fda455cfea2df707dde052034411ce63de218453
+Subproject commit b99d1fe7709e0df0dd100774c4e9ea2c316272fc
diff --git a/vendor/nim-stew b/vendor/nim-stew
index 7184d2424..f2f9685ec 160000
--- a/vendor/nim-stew
+++ b/vendor/nim-stew
@@ -1 +1 @@
-Subproject commit 7184d2424dc3945657884646a72715d494917aad
+Subproject commit f2f9685ec904868bbb48485e72ddc026ed51b230
diff --git a/vendor/nim-toml-serialization b/vendor/nim-toml-serialization
index 4879c8893..a243648f2 160000
--- a/vendor/nim-toml-serialization
+++ b/vendor/nim-toml-serialization
@@ -1 +1 @@
-Subproject commit 4879c8893c1d89495f088b9e2488417935d235d4
+Subproject commit a243648f241c205b5b7fc72abb0f9c14a2812b3a
diff --git a/vendor/nim-unicodedb b/vendor/nim-unicodedb
index c3c9ae079..c70f8bc8c 160000
--- a/vendor/nim-unicodedb
+++ b/vendor/nim-unicodedb
@@ -1 +1 @@
-Subproject commit c3c9ae079ab2eed33ffe5ca27ec4013beed7647f
+Subproject commit c70f8bc8c7373265670e0575bc5eda36fe3761b0
diff --git a/vendor/nim-unittest2 b/vendor/nim-unittest2
index bdb5eca35..da8398c45 160000
--- a/vendor/nim-unittest2
+++ b/vendor/nim-unittest2
@@ -1 +1 @@
-Subproject commit bdb5eca353acd46654f89edeef6f84d0dba8f5d0
+Subproject commit da8398c45cafd5bd7772da1fc96e3924a18d3823
diff --git a/vendor/nim-web3 b/vendor/nim-web3
index 78a9e5d09..d596e68c1 160000
--- a/vendor/nim-web3
+++ b/vendor/nim-web3
@@ -1 +1 @@
-Subproject commit 78a9e5d097c755e16ddbccbfc488e7117b04ec3b
+Subproject commit d596e68c14d0cf7fb3d52023ba16cac49b615173
diff --git a/vendor/nim-websock b/vendor/nim-websock
index acbe30e9c..691f069b2 160000
--- a/vendor/nim-websock
+++ b/vendor/nim-websock
@@ -1 +1 @@
-Subproject commit acbe30e9ca1e51dcbbfe4c552ee6f16c7eede538
+Subproject commit 691f069b209d372b1240d5ae1f57fb7bbafeaba7
diff --git a/vendor/nimbus-build-system b/vendor/nimbus-build-system
index dc535cd46..c488f87b0 160000
--- a/vendor/nimbus-build-system
+++ b/vendor/nimbus-build-system
@@ -1 +1 @@
-Subproject commit dc535cd4627e6c1ec023ee6d6d0c3e5d66d414e5
+Subproject commit c488f87b09591e509c5c7da998e466df4a4b0a5f
diff --git a/vendor/nimcrypto b/vendor/nimcrypto
index 24e006df8..4014ef939 160000
--- a/vendor/nimcrypto
+++ b/vendor/nimcrypto
@@ -1 +1 @@
-Subproject commit 24e006df85927f64916e60511620583b11403178
+Subproject commit 4014ef939b51e02053c2e16dd3481d47bc9267dd
diff --git a/vendor/zerokit b/vendor/zerokit
index 32f3202e9..005393d69 160000
--- a/vendor/zerokit
+++ b/vendor/zerokit
@@ -1 +1 @@
-Subproject commit 32f3202e9dacde84c0f1552582732dbac5da9964
+Subproject commit 005393d69606d2893c9b2b7aed506d1920472688