From c3d5701b3856d38a77477b099c093c1f3e9684d9 Mon Sep 17 00:00:00 2001 From: Hanno Cornelius <68783915+jm-clius@users.noreply.github.com> Date: Thu, 22 Jul 2021 10:43:41 +0200 Subject: [PATCH] Update submodules (#682) --- .gitmodules | 10 ++++++++++ vendor/nim-chronicles | 2 +- vendor/nim-chronos | 2 +- vendor/nim-eth | 2 +- vendor/nim-http-utils | 2 +- vendor/nim-json-rpc | 2 +- vendor/nim-libp2p | 2 +- vendor/nim-metrics | 2 +- vendor/nim-stew | 2 +- vendor/nim-stint | 2 +- vendor/nim-websock | 1 + vendor/nim-zlib | 1 + waku/common/wakubridge.nim | 2 +- waku/v2/node/jsonrpc/debug_api.nim | 2 ++ waku/v2/node/jsonrpc/jsonrpc_types.nim | 2 ++ waku/v2/node/jsonrpc/jsonrpc_utils.nim | 2 ++ waku/v2/node/storage/message/waku_message_store.nim | 2 +- waku/v2/protocol/waku_lightpush/waku_lightpush.nim | 2 +- .../protocol/waku_rln_relay/waku_rln_relay_types.nim | 4 +++- waku/v2/protocol/waku_store/waku_store_types.nim | 2 ++ waku/v2/utils/pagination.nim | 2 ++ waku/v2/utils/requests.nim | 2 ++ 22 files changed, 39 insertions(+), 13 deletions(-) create mode 160000 vendor/nim-websock create mode 160000 vendor/nim-zlib diff --git a/.gitmodules b/.gitmodules index e70cc563b..819a84983 100644 --- a/.gitmodules +++ b/.gitmodules @@ -120,3 +120,13 @@ url = https://github.com/status-im/nim-unittest2.git ignore = untracked branch = master +[submodule "vendor/nim-websock"] + path = vendor/nim-websock + url = https://github.com/status-im/nim-websock.git + ignore = untracked + branch = master +[submodule "vendor/nim-zlib"] + path = vendor/nim-zlib + url = https://github.com/status-im/nim-zlib.git + ignore = untracked + branch = master diff --git a/vendor/nim-chronicles b/vendor/nim-chronicles index 63ce43a86..ba2817f1a 160000 --- a/vendor/nim-chronicles +++ b/vendor/nim-chronicles @@ -1 +1 @@ -Subproject commit 63ce43a86a40a4c73d1b3b8317278d47ec55a458 +Subproject commit ba2817f1a9f5ddb59274295f3fe9a54fbf1a5a96 diff --git a/vendor/nim-chronos b/vendor/nim-chronos index f7dd6b76c..14ebf269e 160000 --- a/vendor/nim-chronos +++ b/vendor/nim-chronos @@ -1 +1 @@ -Subproject commit f7dd6b76c2cbf58a8ed755251086067cb67f420e +Subproject commit 14ebf269e9322de5a7f1fa455033b0bcf18144c6 diff --git a/vendor/nim-eth b/vendor/nim-eth index a8d11dd30..20ad6504b 160000 --- a/vendor/nim-eth +++ b/vendor/nim-eth @@ -1 +1 @@ -Subproject commit a8d11dd30bf0b844e049702353addbbca803845c +Subproject commit 20ad6504b7e7869fbf2ce19a7e7a476a80f94cc4 diff --git a/vendor/nim-http-utils b/vendor/nim-http-utils index 8b492c74b..9a56559ae 160000 --- a/vendor/nim-http-utils +++ b/vendor/nim-http-utils @@ -1 +1 @@ -Subproject commit 8b492c74b56c62bcee991a6899d413938a3accc5 +Subproject commit 9a56559ae3ce7e81b75ae150c1030adf991bf39c diff --git a/vendor/nim-json-rpc b/vendor/nim-json-rpc index 22c342bcc..318949a40 160000 --- a/vendor/nim-json-rpc +++ b/vendor/nim-json-rpc @@ -1 +1 @@ -Subproject commit 22c342bcc11515c69d59b53819bd38ab813d9b93 +Subproject commit 318949a4013504f4ec8931f14bc1b5d6e00dee78 diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p index bd2e9a046..c1b2d45d1 160000 --- a/vendor/nim-libp2p +++ b/vendor/nim-libp2p @@ -1 +1 @@ -Subproject commit bd2e9a04622d4dece2a7e23552050d6c6261f92d +Subproject commit c1b2d45d1b562df1af29012e58f33ff8bff597ac diff --git a/vendor/nim-metrics b/vendor/nim-metrics index 7349a421c..b4c6a51ee 160000 --- a/vendor/nim-metrics +++ b/vendor/nim-metrics @@ -1 +1 @@ -Subproject commit 7349a421cff02c27df9f7622801459d6b5d65dcd +Subproject commit b4c6a51ee75b102a9e36b8b8f2a02760d38219d8 diff --git a/vendor/nim-stew b/vendor/nim-stew index 70680e2af..3c91b8694 160000 --- a/vendor/nim-stew +++ b/vendor/nim-stew @@ -1 +1 @@ -Subproject commit 70680e2af2f3b0ead9ea49969731910e0898fbbe +Subproject commit 3c91b8694e15137a81ec7db37c6c58194ec94a6a diff --git a/vendor/nim-stint b/vendor/nim-stint index ca897811d..484031fdf 160000 --- a/vendor/nim-stint +++ b/vendor/nim-stint @@ -1 +1 @@ -Subproject commit ca897811df3e9aa6106916c30203a442bf3fd8d4 +Subproject commit 484031fdff38858ee661b0476dad44c13539c60e diff --git a/vendor/nim-websock b/vendor/nim-websock new file mode 160000 index 000000000..d60df8176 --- /dev/null +++ b/vendor/nim-websock @@ -0,0 +1 @@ +Subproject commit d60df8176d187683cbfd0945b37fc8c885594ac9 diff --git a/vendor/nim-zlib b/vendor/nim-zlib new file mode 160000 index 000000000..6bbc67d09 --- /dev/null +++ b/vendor/nim-zlib @@ -0,0 +1 @@ +Subproject commit 6bbc67d09e624d69052d62b2353878f491186942 diff --git a/waku/common/wakubridge.nim b/waku/common/wakubridge.nim index 8d899233d..44652340f 100644 --- a/waku/common/wakubridge.nim +++ b/waku/common/wakubridge.nim @@ -4,7 +4,7 @@ import std/[tables, hashes, sequtils], chronos, confutils, chronicles, chronicles/topics_registry, metrics, metrics/chronos_httpserver, - stew/[byteutils, objects], + stew/byteutils, stew/shims/net as stewNet, json_rpc/rpcserver, # Waku v1 imports eth/[keys, p2p], eth/common/utils, diff --git a/waku/v2/node/jsonrpc/debug_api.nim b/waku/v2/node/jsonrpc/debug_api.nim index 9dcbf388c..c6c8986c5 100644 --- a/waku/v2/node/jsonrpc/debug_api.nim +++ b/waku/v2/node/jsonrpc/debug_api.nim @@ -1,3 +1,5 @@ +{.push raises: [Defect, CatchableError].} + import chronicles, json_rpc/rpcserver, diff --git a/waku/v2/node/jsonrpc/jsonrpc_types.nim b/waku/v2/node/jsonrpc/jsonrpc_types.nim index ef1bd9dc2..fa4219744 100644 --- a/waku/v2/node/jsonrpc/jsonrpc_types.nim +++ b/waku/v2/node/jsonrpc/jsonrpc_types.nim @@ -1,3 +1,5 @@ +{.push raises: [Defect].} + import std/[options,tables], eth/keys, diff --git a/waku/v2/node/jsonrpc/jsonrpc_utils.nim b/waku/v2/node/jsonrpc/jsonrpc_utils.nim index 01a900f08..d4ddaa237 100644 --- a/waku/v2/node/jsonrpc/jsonrpc_utils.nim +++ b/waku/v2/node/jsonrpc/jsonrpc_utils.nim @@ -1,3 +1,5 @@ +{.push raises: [Defect].} + import std/[options, json], eth/keys, diff --git a/waku/v2/node/storage/message/waku_message_store.nim b/waku/v2/node/storage/message/waku_message_store.nim index 3b7a0952a..ddc24b3fe 100644 --- a/waku/v2/node/storage/message/waku_message_store.nim +++ b/waku/v2/node/storage/message/waku_message_store.nim @@ -1,7 +1,7 @@ {.push raises: [Defect].} import - std/[tables, strutils], + std/tables, sqlite3_abi, stew/[byteutils, results], ./message_store, diff --git a/waku/v2/protocol/waku_lightpush/waku_lightpush.nim b/waku/v2/protocol/waku_lightpush/waku_lightpush.nim index f3afa991f..79970de1c 100644 --- a/waku/v2/protocol/waku_lightpush/waku_lightpush.nim +++ b/waku/v2/protocol/waku_lightpush/waku_lightpush.nim @@ -1,7 +1,7 @@ {.push raises: [Defect].} import - std/[tables, sequtils, options], + std/[tables, options], bearssl, chronos, chronicles, metrics, stew/results, libp2p/protocols/pubsub/pubsubpeer, diff --git a/waku/v2/protocol/waku_rln_relay/waku_rln_relay_types.nim b/waku/v2/protocol/waku_rln_relay/waku_rln_relay_types.nim index 28cdfe45b..5a444092d 100644 --- a/waku/v2/protocol/waku_rln_relay/waku_rln_relay_types.nim +++ b/waku/v2/protocol/waku_rln_relay/waku_rln_relay_types.nim @@ -1,5 +1,7 @@ +{.push raises: [Defect].} + import - chronicles, options, chronos, stint, + options, chronos, stint, web3, eth/keys diff --git a/waku/v2/protocol/waku_store/waku_store_types.nim b/waku/v2/protocol/waku_store/waku_store_types.nim index 5e915d422..0c3d43130 100644 --- a/waku/v2/protocol/waku_store/waku_store_types.nim +++ b/waku/v2/protocol/waku_store/waku_store_types.nim @@ -1,5 +1,7 @@ ## Types for waku_store protocol. +{.push raises: [Defect].} + # Group by std, external then internal imports import # external imports diff --git a/waku/v2/utils/pagination.nim b/waku/v2/utils/pagination.nim index 115b0e955..d2c617e7a 100644 --- a/waku/v2/utils/pagination.nim +++ b/waku/v2/utils/pagination.nim @@ -2,6 +2,8 @@ ## ## Used by both message store and store protocol. +{.push raises: [Defect].} + import nimcrypto/hash type diff --git a/waku/v2/utils/requests.nim b/waku/v2/utils/requests.nim index f0da4962c..0b8db18f7 100644 --- a/waku/v2/utils/requests.nim +++ b/waku/v2/utils/requests.nim @@ -1,5 +1,7 @@ # Request utils. +{.push raises: [Defect].} + import bearssl, stew/byteutils proc generateRequestId*(rng: ref BrHmacDrbgContext): string =