waku-org/nwaku
1
0
Fork 0
mirror of https://github.com/waku-org/nwaku.git synced 2025-02-28 15:00:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Bump dependencies for v0.31.0 (#2885)

Browse Source 
* bump_dependencies.md: add nim-results dependency
* change imports stew/results to results
* switching to Nim 2.0.8
* waku.nimble: reflect the requirement nim 1.6.0 to 2.0.8
  Adding --mm:refc as nim 2.0 enables a new garbage collector that we're
  not yet ready to support
* adapt waku code to Nim 2.0
* gcsafe adaptations because Nim 2.0 is more strict
This commit is contained in:
Ivan FB 2024-07-09 13:14:28 +02:00 committed by GitHub
parent 8bfad3ab45
commit fd6a71cdd7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
141 changed files with 239 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/ISSUE_TEMPLATE/bump_dependencies.md vendored
View File

@ -31,6 +31,7 @@ Update `nwaku` "vendor" dependencies.
- [ ] nim-nat-traversal - [ ] nim-nat-traversal
- [ ] nim-presto - [ ] nim-presto
- [ ] nim-regex ( update to the latest tag version ) - [ ] nim-regex ( update to the latest tag version )
- [ ] nim-results
- [ ] nim-secp256k1 - [ ] nim-secp256k1
- [ ] nim-serialization - [ ] nim-serialization
- [ ] nim-sqlite3-abi ( update to the latest tag version ) - [ ] nim-sqlite3-abi ( update to the latest tag version )

5
.gitmodules vendored
View File

@ -164,3 +164,8 @@
branch = master branch = master
path = vendor/nim-results path = vendor/nim-results
url = https://github.com/arnetheduck/nim-results.git url = https://github.com/arnetheduck/nim-results.git
[submodule "vendor/db_connector"]
path = vendor/db_connector
url = https://github.com/nim-lang/db_connector.git
ignore = untracked
branch = master

2
apps/benchmarks/benchmarks.nim
View File

@ -1,7 +1,7 @@
import import
math, math,
std/sequtils, std/sequtils,
stew/results, results,
options, options,
waku/[ waku/[
waku_rln_relay/protocol_types, waku_rln_relay/protocol_types,

2
apps/liteprotocoltester/filter_subscriber.nim
View File

@ -8,7 +8,7 @@ import
chronos, chronos,
chronos/timer as chtimer, chronos/timer as chtimer,
stew/byteutils, stew/byteutils,
stew/results, results,
serialization, serialization,
json_serialization as js, json_serialization as js,
times times

2
apps/liteprotocoltester/lightpush_publisher.nim
View File

@ -4,7 +4,7 @@ import
chronicles, chronicles,
chronos, chronos,
stew/byteutils, stew/byteutils,
stew/results, results,
json_serialization as js json_serialization as js
import import
waku/[common/logging, waku_node, node/peer_manager, waku_core, waku_lightpush/client], waku/[common/logging, waku_node, node/peer_manager, waku_core, waku_lightpush/client],

2
apps/liteprotocoltester/tester_config.nim
View File

@ -1,6 +1,6 @@
import import
std/[strutils, strformat], std/[strutils, strformat],
stew/results, results,
chronos, chronos,
regex, regex,
confutils, confutils,

2
apps/networkmonitor/networkmonitor.nim
View File

@ -2,7 +2,7 @@
import import
std/[tables, strutils, times, sequtils, random], std/[tables, strutils, times, sequtils, random],
stew/results, results,
stew/shims/net, stew/shims/net,
chronicles, chronicles,
chronicles/topics_registry, chronicles/topics_registry,

2
apps/networkmonitor/networkmonitor_config.nim
View File

@ -4,7 +4,7 @@ import
confutils, confutils,
chronos, chronos,
std/strutils, std/strutils,
stew/results, results,
stew/shims/net, stew/shims/net,
regex regex

2
apps/networkmonitor/networkmonitor_metrics.nim
View File

@ -10,7 +10,7 @@ import
metrics/chronos_httpserver, metrics/chronos_httpserver,
presto/route, presto/route,
presto/server, presto/server,
stew/results, results,
stew/shims/net stew/shims/net
logScope: logScope:

2
apps/networkmonitor/networkmonitor_utils.nim
View File

@ -2,7 +2,7 @@
import import
std/json, std/json,
stew/results, results,
stew/shims/net, stew/shims/net,
chronicles, chronicles,
chronicles/topics_registry, chronicles/topics_registry,

2
examples/filter_subscriber.nim
View File

@ -1,7 +1,7 @@
## Example showing how a resource restricted client may ## Example showing how a resource restricted client may
## subscribe to messages without relay ## subscribe to messages without relay
import chronicles, chronos, stew/byteutils, stew/results import chronicles, chronos, stew/byteutils, results
import waku/[common/logging, node/peer_manager, waku_core, waku_filter_v2/client] import waku/[common/logging, node/peer_manager, waku_core, waku_filter_v2/client]
const const

2
examples/lightpush_publisher.nim
View File

@ -1,7 +1,7 @@
## Example showing how a resource restricted client may ## Example showing how a resource restricted client may
## use lightpush to publish messages without relay ## use lightpush to publish messages without relay
import chronicles, chronos, stew/byteutils, stew/results import chronicles, chronos, stew/byteutils, results
import waku/[common/logging, node/peer_manager, waku_core, waku_lightpush/client] import waku/[common/logging, node/peer_manager, waku_core, waku_lightpush/client]
const const

2
examples/wakustealthcommitments/erc_5564_interface.nim
View File

@ -1,7 +1,7 @@
## Nim wrappers for the functions defined in librln ## Nim wrappers for the functions defined in librln
{.push raises: [].} {.push raises: [].}
import stew/results import results
###################################################################### ######################################################################
## ERC-5564-BN254 module APIs ## ERC-5564-BN254 module APIs

2
examples/wakustealthcommitments/stealth_commitment_protocol.nim
View File

@ -1,7 +1,7 @@
{.push raises: [].} {.push raises: [].}
import import
stew/results, results,
waku/[common/logging, waku/[common/logging,
waku_node, waku_node,
waku_rln_relay,], waku_rln_relay,],

3
examples/wakustealthcommitments/wakustealthcommitments.nim
View File

@ -1,7 +1,6 @@
{.push raises: [].} {.push raises: [].}
import import results, chronicles, ./node_spec as Waku, ./stealth_commitment_protocol as SCP
stew/results, chronicles, ./node_spec as Waku, ./stealth_commitment_protocol as SCP
logScope: logScope:
topics = "waku stealthcommitments" topics = "waku stealthcommitments"

2
examples/wakustealthcommitments/wire_spec.nim
View File

@ -1,5 +1,5 @@
import std/[times, options] import std/[times, options]
import confutils, chronicles, chronos, stew/results import confutils, chronicles, chronos, results
import waku/[waku_core, common/protobuf] import waku/[waku_core, common/protobuf]
import libp2p/protobuf/minprotobuf import libp2p/protobuf/minprotobuf

10
library/libwaku.nim
View File

@ -8,11 +8,11 @@ when defined(linux):
import std/[json, sequtils, atomics, times, strformat, options, atomics, strutils, os] import std/[json, sequtils, atomics, times, strformat, options, atomics, strutils, os]
import chronicles, chronos import chronicles, chronos
import import
../../waku/common/base64, waku/common/base64,
../../waku/waku_core/message/message, waku/waku_core/message/message,
../../waku/node/waku_node, waku/node/waku_node,
../../waku/waku_core/topics/pubsub_topic, waku/waku_core/topics/pubsub_topic,
../../../waku/waku_relay/protocol, waku/waku_relay/protocol,
./events/json_message_event, ./events/json_message_event,
./waku_thread/waku_thread, ./waku_thread/waku_thread,
./waku_thread/inter_thread_communication/requests/node_lifecycle_request, ./waku_thread/inter_thread_communication/requests/node_lifecycle_request,

1
library/nim.cfg Normal file
View File

@ -0,0 +1 @@
path = "../"

2
library/waku_thread/inter_thread_communication/requests/debug_node_request.nim
View File

@ -1,5 +1,5 @@
import std/json import std/json
import chronicles, chronos, stew/results import chronicles, chronos, results
import ../../../../waku/factory/waku, ../../../../waku/node/waku_node import ../../../../waku/factory/waku, ../../../../waku/node/waku_node
type DebugNodeMsgType* = enum type DebugNodeMsgType* = enum

2
library/waku_thread/inter_thread_communication/requests/discovery_request.nim
View File

@ -1,5 +1,5 @@
import std/[json, sequtils] import std/[json, sequtils]
import chronos, stew/results, libp2p/multiaddress import chronos, results, libp2p/multiaddress
import import
../../../../waku/factory/waku, ../../../../waku/factory/waku,
../../../../waku/discovery/waku_dnsdisc, ../../../../waku/discovery/waku_dnsdisc,

2
library/waku_thread/inter_thread_communication/requests/node_lifecycle_request.nim
View File

@ -1,5 +1,5 @@
import std/[options, sequtils, json, strutils, net] import std/[options, sequtils, json, strutils, net]
import chronos, chronicles, stew/results, confutils, confutils/std/net import chronos, chronicles, results, confutils, confutils/std/net
import import
../../../../waku/node/peer_manager/peer_manager, ../../../../waku/node/peer_manager/peer_manager,

2
library/waku_thread/inter_thread_communication/requests/peer_manager_request.nim
View File

@ -1,5 +1,5 @@
import std/[sequtils, strutils] import std/[sequtils, strutils]
import chronicles, chronos, stew/results import chronicles, chronos, results
import ../../../../waku/factory/waku, ../../../../waku/node/waku_node, ../../../alloc import ../../../../waku/factory/waku, ../../../../waku/node/waku_node, ../../../alloc
type PeerManagementMsgType* = enum type PeerManagementMsgType* = enum

2
library/waku_thread/inter_thread_communication/requests/protocols/relay_request.nim
View File

@ -1,5 +1,5 @@
import std/net import std/net
import chronicles, chronos, stew/byteutils, stew/results import chronicles, chronos, stew/byteutils, results
import import
../../../../../waku/waku_core/message/message, ../../../../../waku/waku_core/message/message,
../../../../../waku/factory/waku, ../../../../../waku/factory/waku,

2
library/waku_thread/inter_thread_communication/requests/protocols/store_request.nim
View File

@ -1,4 +1,4 @@
import chronos, stew/results import chronos, results
import ../../../../../waku/factory/waku, ../../../../alloc, ../../../../callback import ../../../../../waku/factory/waku, ../../../../alloc, ../../../../callback
type StoreReqType* = enum type StoreReqType* = enum

2
library/waku_thread/inter_thread_communication/waku_thread_request.nim
View File

@ -2,7 +2,7 @@
## The requests are created by the main thread and processed by ## The requests are created by the main thread and processed by
## the Waku Thread. ## the Waku Thread.
import std/json, stew/results import std/json, results
import chronos import chronos
import import
../../../waku/factory/waku, ../../../waku/factory/waku,

2
library/waku_thread/inter_thread_communication/waku_thread_response.nim
View File

@ -2,7 +2,7 @@
## The response will be created from the Waku Thread and processed in ## The response will be created from the Waku Thread and processed in
## the main thread. ## the main thread.
import std/json, stew/results import std/json, results
import ../../alloc import ../../alloc
type ResponseType {.pure.} = enum type ResponseType {.pure.} = enum

5
library/waku_thread/waku_thread.nim
View File

@ -3,10 +3,9 @@
{.passc: "-fPIC".} {.passc: "-fPIC".}
import std/[options, atomics, os, net] import std/[options, atomics, os, net]
import chronicles, chronos, chronos/threadsync, taskpools/channels_spsc_single, results
import import
chronicles, chronos, chronos/threadsync, taskpools/channels_spsc_single, stew/results waku/factory/waku,
import
../../../waku/factory/waku,
./inter_thread_communication/waku_thread_request, ./inter_thread_communication/waku_thread_request,
./inter_thread_communication/waku_thread_response ./inter_thread_communication/waku_thread_response

2
tests/waku_core/test_namespaced_topics.nim
View File

@ -1,6 +1,6 @@
{.used.} {.used.}
import std/options, stew/results, testutils/unittests import std/options, results, testutils/unittests
import waku/waku_core/topics import waku/waku_core/topics
suite "Waku Message - Content topics namespacing": suite "Waku Message - Content topics namespacing":

2
tests/waku_store/store_utils.nim
View File

@ -18,6 +18,6 @@ proc newTestWakuStore*(
return proto return proto
proc newTestWakuStoreClient*(switch: Switch): WakuStoreClient = proc newTestWakuStoreClient*(switch: Switch): WakuStoreClient {.gcsafe.} =
let peerManager = PeerManager.new(switch) let peerManager = PeerManager.new(switch)
WakuStoreClient.new(peerManager, rng) WakuStoreClient.new(peerManager, rng)

2
tools/rln_db_inspector/rln_db_inspector.nim
View File

@ -3,7 +3,7 @@ when (NimMajor, NimMinor) < (1, 4):
else: else:
{.push raises: [].} {.push raises: [].}
import chronicles, sequtils, stew/[results] import chronicles, sequtils, results
import import
waku/[waku_rln_relay/rln, waku_rln_relay/conversion_utils, factory/external_config] waku/[waku_rln_relay/rln, waku_rln_relay/conversion_utils, factory/external_config]

2
tools/rln_keystore_generator/rln_keystore_generator.nim
View File

@ -3,7 +3,7 @@ when (NimMajor, NimMinor) < (1, 4):
else: else:
{.push raises: [].} {.push raises: [].}
import chronicles, stew/[results], std/tempfiles import chronicles, results, std/tempfiles
import import
waku/[ waku/[

1
vendor/db_connector vendored Submodule

@ -0,0 +1 @@
Subproject commit 70d2ab3ff9907cb5b1d863bfb333a0ced5ee1596

2
vendor/nim-bearssl vendored

@ -1 +1 @@
Subproject commit a806cbfab5fe8de49c76139f8705fff79daf99ee Subproject commit 646fa2152b11980c24bf34b3e214b479c9d25f21

2
vendor/nim-chronos vendored

@ -1 +1 @@
Subproject commit 4ad38079dec8407c396ebaaf6ba60e5e94e3fce5 Subproject commit 13d28a5b710c414be17bfe36ca25bf34771875cc

2
vendor/nim-confutils vendored

@ -1 +1 @@
Subproject commit 0adf3b7db70736061bf12fa23c2fc51f395b289e Subproject commit cb640db2cd66d7f4a1810a7df51b55f6f59cf3c5

2
vendor/nim-dnsdisc vendored

@ -1 +1 @@
Subproject commit c138792c9385208626a005ffa0833101760b0da5 Subproject commit 38f853df30bcfdb73055b7fd7de284a47eebecc2

2
vendor/nim-faststreams vendored

@ -1 +1 @@
Subproject commit 11b9d952a80ec87e2443405a6a5382f9daac51f8 Subproject commit dbc4a95df60238157dcf286f6125188cb72f37c1

2
vendor/nim-http-utils vendored

@ -1 +1 @@
Subproject commit be57dbc902d36f37540897e98c69aa80f868cb45 Subproject commit 98496aa24d9364d1652e531f5f346de9b7cb3e15

2
vendor/nim-json-serialization vendored

@ -1 +1 @@
Subproject commit 4d0b0662ed960ab2c5a1ddbd08f77048bac13ae7 Subproject commit 89f7be1783b2f828a95dea1496fdac3510532997

2
vendor/nim-libbacktrace vendored

@ -1 +1 @@
Subproject commit aab85b6d242df38706664373f089675235953ab8 Subproject commit 4db9cae5ac0225e3439f577f5c5cd67086232b3f

2
vendor/nim-libp2p vendored

@ -1 +1 @@
Subproject commit d0af3fbe8559f69195657a360c3dd4ac4552c811 Subproject commit 94d93cbf2531296f0e636aa702b500b242eb4158

2
vendor/nim-metrics vendored

@ -1 +1 @@
Subproject commit 0e768ca7fb7df4798649145a403e7db65cae1f8b Subproject commit f068c85196cd4464e97d52ff0ea3d5ed8e59da1b

2
vendor/nim-nat-traversal vendored

@ -1 +1 @@
Subproject commit 54bf8aa2913e8550463779beeae4b469941e039c Subproject commit 459fc4968799bde97592137f42d93e5069f06e73

2
vendor/nim-presto vendored

@ -1 +1 @@
Subproject commit a9687dda1c3e20d5b066d42b33c2a63f018af93f Subproject commit 2190421e09938696cd95d54b1f4753446c84c7a2

2
vendor/nim-results vendored

@ -1 +1 @@
Subproject commit 193d3c6648bd0f7e834d4ebd6a1e1d5f93998197 Subproject commit e2adf66b8bc2f41606e8469a5f0a850d1e545b55

2
vendor/nim-secp256k1 vendored

@ -1 +1 @@
Subproject commit 194b715b16766e383b5aef92dd779fb182faf45d Subproject commit c1795d1fb64b6cfe932a8d977a123b55a562dc52

2
vendor/nim-serialization vendored

@ -1 +1 @@
Subproject commit afae13adac25b6fa98bacf4b9f38458dc64317b0 Subproject commit 298a9554a885b2df59737bb3461aac8d0d339724

2
vendor/nim-stew vendored

@ -1 +1 @@
Subproject commit 104132fd0217e846b04dd26a5fbe3e43a4929a05 Subproject commit e00fea1f6e14234adb10d9c117a70905ae31872b

2
vendor/nim-stint vendored

@ -1 +1 @@
Subproject commit 9d2b382c5dc34f0d6bbd93b2a5d65dde85067e0f Subproject commit 9a3348bd4499045fb211afeeaf2a54730060c081

2
vendor/nim-toml-serialization vendored

@ -1 +1 @@
Subproject commit 24bbfcb8e4e256883fc959dc6f5c15fe7a84fca5 Subproject commit cb1fc73f3519fed5f3a8fbfa90afc9a96d5f5f5c

2
vendor/nim-unicodedb vendored

@ -1 +1 @@
Subproject commit 3db16f8ece5d0eba310c8f1ed812c6ff5a21a34a Subproject commit 8c8959d84c12ecda6ea14c67bd68675b1936f8cf

2
vendor/nimbus-build-system vendored

@ -1 +1 @@
Subproject commit d7e7f1044def3c62d0b4bcec60c0b53876e44d71 Subproject commit 741274439ce72162ab3c740e7c0ef624d32725f9

2
vendor/nimcrypto vendored

@ -1 +1 @@
Subproject commit 485f7b3cfa83c1beecc0e31be0e964d697aa74d7 Subproject commit 71bca15508e2c0548f32b42a69bcfb1ccd9ab9ff

36
waku.nimble
View File

@ -1,14 +1,14 @@
mode = ScriptMode.Verbose mode = ScriptMode.Verbose
### Package ### Package
version = "0.1.0" version = "0.1.0"
author = "Status Research & Development GmbH" author = "Status Research & Development GmbH"
description = "Waku, Private P2P Messaging for Resource-Restricted Devices" description = "Waku, Private P2P Messaging for Resource-Restricted Devices"
license = "MIT or Apache License 2.0" license = "MIT or Apache License 2.0"
#bin = @["build/waku"] #bin = @["build/waku"]
### Dependencies ### Dependencies
requires "nim >= 1.6.0", requires "nim >= 2.0.8",
"chronicles", "chronicles",
"confutils", "confutils",
"chronos", "chronos",
@ -22,7 +22,8 @@ requires "nim >= 1.6.0",
"libp2p", # Only for Waku v2 "libp2p", # Only for Waku v2
"web3", "web3",
"presto", "presto",
"regex" "regex",
"db_connector"
### Helper functions ### Helper functions
proc buildBinary(name: string, srcDir = "./", params = "", lang = "c") = proc buildBinary(name: string, srcDir = "./", params = "", lang = "c") =
@ -30,21 +31,26 @@ proc buildBinary(name: string, srcDir = "./", params = "", lang = "c") =
mkDir "build" mkDir "build"
# allow something like "nim nimbus --verbosity:0 --hints:off nimbus.nims" # allow something like "nim nimbus --verbosity:0 --hints:off nimbus.nims"
var extra_params = params var extra_params = params
for i in 2..<paramCount(): for i in 2 ..< paramCount():
extra_params &= " " & paramStr(i) extra_params &= " " & paramStr(i)
exec "nim " & lang & " --out:build/" & name & " " & extra_params & " " & srcDir & name & ".nim" exec "nim " & lang & " --out:build/" & name & " --mm:refc " & extra_params & " " & srcDir & name &
".nim"
proc buildLibrary(name: string, srcDir = "./", params = "", `type` = "static") = proc buildLibrary(name: string, srcDir = "./", params = "", `type` = "static") =
if not dirExists "build": if not dirExists "build":
mkDir "build" mkDir "build"
# allow something like "nim nimbus --verbosity:0 --hints:off nimbus.nims" # allow something like "nim nimbus --verbosity:0 --hints:off nimbus.nims"
var extra_params = params var extra_params = params
for i in 2..<paramCount(): for i in 2 ..< paramCount():
extra_params &= " " & paramStr(i) extra_params &= " " & paramStr(i)
if `type` == "static": if `type` == "static":
exec "nim c" & " --out:build/" & name & ".a --threads:on --app:staticlib --opt:size --noMain --header " & extra_params & " " & srcDir & name & ".nim" exec "nim c" & " --out:build/" & name &
".a --threads:on --app:staticlib --opt:size --noMain --mm:refc --header " & extra_params &
" " & srcDir & name & ".nim"
else: else:
exec "nim c" & " --out:build/" & name & ".so --threads:on --app:lib --opt:size --noMain --header " & extra_params & " " & srcDir & name & ".nim" exec "nim c" & " --out:build/" & name &
".so --threads:on --app:lib --opt:size --noMain --mm:refc --header " & extra_params & " " &
srcDir & name & ".nim"
proc buildMobileAndroid(srcDir = ".", params = "") = proc buildMobileAndroid(srcDir = ".", params = "") =
let cpu = getEnv("CPU") let cpu = getEnv("CPU")
@ -55,10 +61,13 @@ proc buildMobileAndroid(srcDir = ".", params = "") =
mkDir outDir mkDir outDir
var extra_params = params var extra_params = params
for i in 2..<paramCount(): for i in 2 ..< paramCount():
extra_params &= " " & paramStr(i) extra_params &= " " & paramStr(i)
exec "nim c" & " --out:" & outDir & "/libwaku.so --threads:on --app:lib --opt:size --noMain -d:chronicles_sinks=textlines[dynamic] --header --passL:-L" & outdir & " --passL:-lrln --passL:-llog --cpu:" & cpu & " --os:android -d:androidNDK " & extra_params & " " & srcDir & "/libwaku.nim" exec "nim c" & " --out:" & outDir &
"/libwaku.so --threads:on --app:lib --opt:size --noMain --mm:refc -d:chronicles_sinks=textlines[dynamic] --header --passL:-L" &
outdir & " --passL:-lrln --passL:-llog --cpu:" & cpu & " --os:android -d:androidNDK " &
extra_params & " " & srcDir & "/libwaku.nim"
proc test(name: string, params = "-d:chronicles_log_level=DEBUG", lang = "c") = proc test(name: string, params = "-d:chronicles_log_level=DEBUG", lang = "c") =
# XXX: When running `> NIM_PARAMS="-d:chronicles_log_level=INFO" make test2` # XXX: When running `> NIM_PARAMS="-d:chronicles_log_level=INFO" make test2`
@ -140,4 +149,3 @@ task libWakuAndroid, "Build the mobile bindings for Android":
let srcDir = "./library" let srcDir = "./library"
let extraParams = "-d:chronicles_log_level=ERROR" let extraParams = "-d:chronicles_log_level=ERROR"
buildMobileAndroid srcDir, extraParams buildMobileAndroid srcDir, extraParams

2
waku/common/base64.nim
View File

@ -1,6 +1,6 @@
{.push raises: [].} {.push raises: [].}
import stew/[results, byteutils, base64] import stew/[byteutils, base64], results
type Base64String* = distinct string type Base64String* = distinct string

2
waku/common/databases/common.nim
View File

@ -1,3 +1,3 @@
import stew/results import results
type DatabaseResult*[T] = Result[T, string] type DatabaseResult*[T] = Result[T, string]

4
waku/common/databases/db_postgres/dbconn.nim
View File

@ -1,6 +1,6 @@
import std/[times, strutils], stew/results, chronos import std/[times, strutils], results, chronos
include db_postgres include db_connector/db_postgres
type DataProc* = proc(result: ptr PGresult) {.closure, gcsafe, raises: [].} type DataProc* = proc(result: ptr PGresult) {.closure, gcsafe, raises: [].}

2
waku/common/databases/db_postgres/pgasyncpool.nim
View File

@ -2,7 +2,7 @@
# Inspired by: https://github.com/treeform/pg/ # Inspired by: https://github.com/treeform/pg/
{.push raises: [].} {.push raises: [].}
import std/[sequtils, nre, strformat, sets], stew/results, chronos import std/[sequtils, nre, strformat, sets], results, chronos
import ./dbconn, ../common import ./dbconn, ../common
type PgAsyncPoolState {.pure.} = enum type PgAsyncPoolState {.pure.} = enum

12
waku/common/databases/db_sqlite.nim
View File

@ -4,7 +4,7 @@
# #
# Most of it is a direct copy, the only unique functions being `get` and `put`. # Most of it is a direct copy, the only unique functions being `get` and `put`.
import std/[os, strutils, sequtils, algorithm], stew/results, chronicles, sqlite3_abi import std/[os, strutils, sequtils, algorithm], results, chronicles, sqlite3_abi
import ./common import ./common
logScope: logScope:
@ -50,10 +50,10 @@ template checkErr*(op) =
type SqliteDatabase* = ref object of RootObj type SqliteDatabase* = ref object of RootObj
env*: Sqlite env*: Sqlite
type DataProc* = proc(s: RawStmtPtr) {.closure.} type DataProc* = proc(s: RawStmtPtr) {.closure, gcsafe.}
# the nim-eth definition is different; one more indirection # the nim-eth definition is different; one more indirection
const NoopRowHandler* = proc(s: RawStmtPtr) {.closure.} = const NoopRowHandler* = proc(s: RawStmtPtr) {.closure, gcsafe.} =
discard discard
proc new*(T: type SqliteDatabase, path: string, readOnly = false): DatabaseResult[T] = proc new*(T: type SqliteDatabase, path: string, readOnly = false): DatabaseResult[T] =
@ -214,7 +214,9 @@ proc exec*[Params, Res](
discard sqlite3_reset(s) # same return information as step discard sqlite3_reset(s) # same return information as step
discard sqlite3_clear_bindings(s) # no errors possible discard sqlite3_clear_bindings(s) # no errors possible
proc query*(db: SqliteDatabase, query: string, onData: DataProc): DatabaseResult[bool] = proc query*(
db: SqliteDatabase, query: string, onData: DataProc
): DatabaseResult[bool] {.gcsafe.} =
var s = prepare(db.env, query): var s = prepare(db.env, query):
discard discard
@ -231,7 +233,7 @@ proc query*(db: SqliteDatabase, query: string, onData: DataProc): DatabaseResult
else: else:
return err($sqlite3_errstr(v)) return err($sqlite3_errstr(v))
return ok gotResults return ok gotResults
finally: except Exception, CatchableError:
# release implicit transaction # release implicit transaction
discard sqlite3_reset(s) # same return information as step discard sqlite3_reset(s) # same return information as step
discard sqlite3_clear_bindings(s) # no errors possible discard sqlite3_clear_bindings(s) # no errors possible

2
waku/common/databases/dburl.nim
View File

@ -1,4 +1,4 @@
import std/strutils, regex, stew/results import std/strutils, regex, results
proc validateDbUrl*(dbUrl: string): Result[string, string] = proc validateDbUrl*(dbUrl: string): Result[string, string] =
## dbUrl mimics SQLAlchemy Database URL schema ## dbUrl mimics SQLAlchemy Database URL schema

2
waku/common/enr/builder.nim
View File

@ -2,7 +2,7 @@
import import
std/[options, net], std/[options, net],
stew/results, results,
eth/keys as eth_keys, eth/keys as eth_keys,
eth/p2p/discoveryv5/enr, eth/p2p/discoveryv5/enr,
libp2p/crypto/crypto as libp2p_crypto libp2p/crypto/crypto as libp2p_crypto

3
waku/common/enr/typed_record.nim
View File

@ -1,7 +1,6 @@
{.push raises: [].} {.push raises: [].}
import import std/options, results, eth/keys as eth_keys, libp2p/crypto/crypto as libp2p_crypto
std/options, stew/results, eth/keys as eth_keys, libp2p/crypto/crypto as libp2p_crypto
import eth/p2p/discoveryv5/enr except TypedRecord, toTypedRecord import eth/p2p/discoveryv5/enr except TypedRecord, toTypedRecord

8
waku/common/logging.nim
View File

@ -1,7 +1,7 @@
## This code has been copied and addapted from `status-im/nimbu-eth2` project. ## This code has been copied and addapted from `status-im/nimbu-eth2` project.
## Link: https://github.com/status-im/nimbus-eth2/blob/c585b0a5b1ae4d55af38ad7f4715ad455e791552/beacon_chain/nimbus_binary_common.nim ## Link: https://github.com/status-im/nimbus-eth2/blob/c585b0a5b1ae4d55af38ad7f4715ad455e791552/beacon_chain/nimbus_binary_common.nim
import import
std/[typetraits, os, strutils], std/[typetraits, os, strutils, syncio],
chronicles, chronicles,
chronicles/log_output, chronicles/log_output,
chronicles/topics_registry chronicles/topics_registry
@ -53,7 +53,7 @@ proc stripAnsi(v: string): string =
res res
proc writeAndFlush(f: File, s: LogOutputStr) = proc writeAndFlush(f: syncio.File, s: LogOutputStr) =
try: try:
f.write(s) f.write(s)
f.flushFile() f.flushFile()
@ -71,10 +71,10 @@ proc setupLogFormat(format: LogFormat, color = true) =
discard discard
proc stdoutOutputWriter(logLevel: LogLevel, msg: LogOutputStr) = proc stdoutOutputWriter(logLevel: LogLevel, msg: LogOutputStr) =
writeAndFlush(io.stdout, msg) writeAndFlush(syncio.stdout, msg)
proc stdoutNoColorOutputWriter(logLevel: LogLevel, msg: LogOutputStr) = proc stdoutNoColorOutputWriter(logLevel: LogLevel, msg: LogOutputStr) =
writeAndFlush(io.stdout, stripAnsi(msg)) writeAndFlush(syncio.stdout, stripAnsi(msg))
when defaultChroniclesStream.outputs.type.arity == 2: when defaultChroniclesStream.outputs.type.arity == 2:
case format case format

2
waku/common/utils/matterbridge_client.nim
View File

@ -1,6 +1,6 @@
{.push raises: [].} {.push raises: [].}
import std/[httpclient, json, uri, options], stew/results import std/[httpclient, json, uri, options], results
const const
# Resource locators # Resource locators

2
waku/common/utils/nat.nim
View File

@ -1,7 +1,7 @@
{.push raises: [].} {.push raises: [].}
import std/[options, strutils, net] import std/[options, strutils, net]
import chronicles, eth/net/nat, stew/results, nativesockets import chronicles, eth/net/nat, results, nativesockets
logScope: logScope:
topics = "nat" topics = "nat"

2
waku/common/utils/parse_size_units.nim
View File

@ -1,4 +1,4 @@
import std/strutils, stew/results, regex import std/strutils, results, regex
proc parseMsgSize*(input: string): Result[uint64, string] = proc parseMsgSize*(input: string): Result[uint64, string] =
## Parses size strings such as "1.2 KiB" or "3Kb" and returns the equivalent number of bytes ## Parses size strings such as "1.2 KiB" or "3Kb" and returns the equivalent number of bytes

2
waku/discovery/waku_discv5.nim
View File

@ -2,7 +2,7 @@
import import
std/[sequtils, strutils, options, sets, net, json], std/[sequtils, strutils, options, sets, net, json],
stew/results, results,
chronos, chronos,
chronicles, chronicles,
metrics, metrics,

2
waku/factory/builder.nim
View File

@ -2,7 +2,7 @@
import import
std/[options, net], std/[options, net],
stew/results, results,
chronicles, chronicles,
libp2p/crypto/crypto, libp2p/crypto/crypto,
libp2p/builders, libp2p/builders,

5
waku/factory/external_config.nim
View File

@ -1,6 +1,6 @@
import import
std/[strutils, strformat], std/[strutils, strformat],
stew/results, results,
chronos, chronos,
regex, regex,
confutils, confutils,
@ -77,7 +77,8 @@ type WakuNodeConf* = object
.}: string .}: string
rlnRelayChainId* {. rlnRelayChainId* {.
desc: "Chain ID of the provided contract (optional, will fetch from RPC provider if not used)", desc:
"Chain ID of the provided contract (optional, will fetch from RPC provider if not used)",
defaultValue: 0, defaultValue: 0,
name: "rln-relay-chain-id" name: "rln-relay-chain-id"
.}: uint .}: uint

2
waku/factory/internal_config.nim
View File

@ -5,7 +5,7 @@ import
libp2p/multiaddress, libp2p/multiaddress,
libp2p/nameresolving/dnsresolver, libp2p/nameresolving/dnsresolver,
std/[options, sequtils, net], std/[options, sequtils, net],
stew/results results
import import
./external_config, ./external_config,
../common/utils/nat, ../common/utils/nat,

2
waku/factory/waku.nim
View File

@ -2,7 +2,7 @@
import import
std/[options, sequtils], std/[options, sequtils],
stew/results, results,
chronicles, chronicles,
chronos, chronos,
libp2p/wire, libp2p/wire,

4
waku/node/config.nim
View File

@ -1,9 +1,7 @@
{.push raises: [].} {.push raises: [].}
import import
std/[options, sequtils, strutils, net], std/[options, sequtils, strutils, net], results, libp2p/[multiaddress, multicodec]
stew/results,
libp2p/[multiaddress, multicodec]
import ../../waku/waku_core/peers import ../../waku/waku_core/peers
import ../waku_enr import ../waku_enr

12
waku/node/peer_manager/peer_manager.nim
View File

@ -108,14 +108,16 @@ proc calculateBackoff(
# Helper functions # # Helper functions #
#################### ####################
proc insertOrReplace(ps: PeerStorage, remotePeerInfo: RemotePeerInfo) = proc insertOrReplace(ps: PeerStorage, remotePeerInfo: RemotePeerInfo) {.gcsafe.} =
## Insert peer entry into persistent storage, or replace existing entry with updated info ## Insert peer entry into persistent storage, or replace existing entry with updated info
ps.put(remotePeerInfo).isOkOr: ps.put(remotePeerInfo).isOkOr:
warn "failed to store peers", err = error warn "failed to store peers", err = error
waku_peers_errors.inc(labelValues = ["storage_failure"]) waku_peers_errors.inc(labelValues = ["storage_failure"])
return return
proc addPeer*(pm: PeerManager, remotePeerInfo: RemotePeerInfo, origin = UnknownOrigin) = proc addPeer*(
pm: PeerManager, remotePeerInfo: RemotePeerInfo, origin = UnknownOrigin
) {.gcsafe.} =
## Adds peer to manager for the specified protocol ## Adds peer to manager for the specified protocol
if remotePeerInfo.peerId == pm.switch.peerInfo.peerId: if remotePeerInfo.peerId == pm.switch.peerInfo.peerId:
@ -257,7 +259,7 @@ proc dialPeer(
return none(Connection) return none(Connection)
proc loadFromStorage(pm: PeerManager) = proc loadFromStorage(pm: PeerManager) {.gcsafe.} =
## Load peers from storage, if available ## Load peers from storage, if available
trace "loading peers from storage" trace "loading peers from storage"
@ -435,6 +437,8 @@ proc onPeerEvent(pm: PeerManager, peerId: PeerId, event: PeerEvent) {.async.} =
if pm.ipTable[ip].len == 0: if pm.ipTable[ip].len == 0:
pm.ipTable.del(ip) pm.ipTable.del(ip)
break break
of Identified:
debug "event identified", peerId = peerId
pm.peerStore[ConnectionBook][peerId] = connectedness pm.peerStore[ConnectionBook][peerId] = connectedness
pm.peerStore[DirectionBook][peerId] = direction pm.peerStore[DirectionBook][peerId] = direction
@ -458,7 +462,7 @@ proc new*(
maxFailedAttempts = MaxFailedAttempts, maxFailedAttempts = MaxFailedAttempts,
colocationLimit = DefaultColocationLimit, colocationLimit = DefaultColocationLimit,
shardedPeerManagement = false, shardedPeerManagement = false,
): PeerManager = ): PeerManager {.gcsafe.} =
let capacity = switch.peerStore.capacity let capacity = switch.peerStore.capacity
let maxConnections = switch.connManager.inSema.size let maxConnections = switch.connManager.inSema.size
if maxConnections > capacity: if maxConnections > capacity:

2
waku/node/peer_manager/peer_store/migrations.nim
View File

@ -1,6 +1,6 @@
{.push raises: [].} {.push raises: [].}
import std/[tables, strutils, os], stew/results, chronicles import std/[tables, strutils, os], results, chronicles
import ../../../common/databases/db_sqlite, ../../../common/databases/common import ../../../common/databases/db_sqlite, ../../../common/databases/common
logScope: logScope:

10
waku/node/peer_manager/peer_store/peer_storage.nim
View File

@ -1,6 +1,6 @@
{.push raises: [].} {.push raises: [].}
import stew/results import results
import ../../../waku_core, ../waku_peer_store import ../../../waku_core, ../waku_peer_store
## This module defines a peer storage interface. Implementations of ## This module defines a peer storage interface. Implementations of
@ -11,13 +11,15 @@ type
PeerStorageResult*[T] = Result[T, string] PeerStorageResult*[T] = Result[T, string]
DataProc* = proc(remotePeerInfo: RemotePeerInfo) {.closure, raises: [Defect].} DataProc* = proc(remotePeerInfo: RemotePeerInfo) {.closure, gcsafe, raises: [Defect].}
# PeerStorage interface # PeerStorage interface
method put*( method put*(
db: PeerStorage, remotePeerInfo: RemotePeerInfo db: PeerStorage, remotePeerInfo: RemotePeerInfo
): PeerStorageResult[void] {.base.} = ): PeerStorageResult[void] {.base, gcsafe.} =
return err("Unimplemented") return err("Unimplemented")
method getAll*(db: PeerStorage, onData: DataProc): PeerStorageResult[void] {.base.} = method getAll*(
db: PeerStorage, onData: DataProc
): PeerStorageResult[void] {.base, gcsafe.} =
return err("Unimplemented") return err("Unimplemented")

6
waku/node/peer_manager/peer_store/waku_peer_storage.nim
View File

@ -2,7 +2,7 @@
import import
std/[sets, options], std/[sets, options],
stew/results, results,
sqlite3_abi, sqlite3_abi,
eth/p2p/discoveryv5/enr, eth/p2p/discoveryv5/enr,
libp2p/protobuf/minprotobuf libp2p/protobuf/minprotobuf
@ -126,7 +126,7 @@ proc new*(T: type WakuPeerStorage, db: SqliteDatabase): PeerStorageResult[T] =
method put*( method put*(
db: WakuPeerStorage, remotePeerInfo: RemotePeerInfo db: WakuPeerStorage, remotePeerInfo: RemotePeerInfo
): PeerStorageResult[void] = ): PeerStorageResult[void] {.gcsafe.} =
## Adds a peer to storage or replaces existing entry if it already exists ## Adds a peer to storage or replaces existing entry if it already exists
let encoded = remotePeerInfo.encode().valueOr: let encoded = remotePeerInfo.encode().valueOr:
@ -142,7 +142,7 @@ method getAll*(
): PeerStorageResult[void] = ): PeerStorageResult[void] =
## Retrieves all peers from storage ## Retrieves all peers from storage
proc peer(s: ptr sqlite3_stmt) {.raises: [ResultError[ProtoError]].} = proc peer(s: ptr sqlite3_stmt) {.gcsafe, raises: [ResultError[ProtoError]].} =
let let
# Stored Info # Stored Info
sTo = cast[ptr UncheckedArray[byte]](sqlite3_column_blob(s, 1)) sTo = cast[ptr UncheckedArray[byte]](sqlite3_column_blob(s, 1))

2
waku/node/waku_node.nim
View File

@ -5,7 +5,7 @@ import
chronos, chronos,
chronicles, chronicles,
metrics, metrics,
stew/results, results,
stew/byteutils, stew/byteutils,
eth/keys, eth/keys,
nimcrypto, nimcrypto,

2
waku/utils/noise.nim
View File

@ -1,6 +1,6 @@
{.push raises: [].} {.push raises: [].}
import stew/results import results
import ../waku_core, ../waku_noise/noise_types, ../waku_noise/noise_utils import ../waku_core, ../waku_noise/noise_types, ../waku_noise/noise_utils
# Decodes a WakuMessage to a PayloadV2 # Decodes a WakuMessage to a PayloadV2

2
waku/waku_api/handlers.nim
View File

@ -1,6 +1,6 @@
{.push raises: [].} {.push raises: [].}
import chronos, std/[options, sequtils], stew/results import chronos, std/[options, sequtils], results
import ../discovery/waku_discv5, ../waku_relay, ../waku_core, ./message_cache import ../discovery/waku_discv5, ../waku_relay, ../waku_core, ./message_cache
### Discovery ### Discovery

2
waku/waku_api/message_cache.nim
View File

@ -2,7 +2,7 @@
import import
std/[sequtils, sugar, algorithm, options], std/[sequtils, sugar, algorithm, options],
stew/results, results,
chronicles, chronicles,
chronos, chronos,
libp2p/protocols/pubsub libp2p/protocols/pubsub

30
waku/waku_api/rest/builder.nim
View File

@ -3,21 +3,21 @@
import net, tables import net, tables
import presto import presto
import import
../../waku/waku_node, waku/waku_node,
../../waku/discovery/waku_discv5, waku/discovery/waku_discv5,
../../waku/factory/external_config, waku/factory/external_config,
../../waku/waku_api/message_cache, waku/waku_api/message_cache,
../../waku/waku_api/handlers, waku/waku_api/handlers,
../../waku/waku_api/rest/server, waku/waku_api/rest/server,
../../waku/waku_api/rest/debug/handlers as rest_debug_api, waku/waku_api/rest/debug/handlers as rest_debug_api,
../../waku/waku_api/rest/relay/handlers as rest_relay_api, waku/waku_api/rest/relay/handlers as rest_relay_api,
../../waku/waku_api/rest/filter/handlers as rest_filter_api, waku/waku_api/rest/filter/handlers as rest_filter_api,
../../waku/waku_api/rest/lightpush/handlers as rest_lightpush_api, waku/waku_api/rest/lightpush/handlers as rest_lightpush_api,
../../waku/waku_api/rest/store/handlers as rest_store_api, waku/waku_api/rest/store/handlers as rest_store_api,
../../waku/waku_api/rest/legacy_store/handlers as rest_store_legacy_api, waku/waku_api/rest/legacy_store/handlers as rest_store_legacy_api,
../../waku/waku_api/rest/health/handlers as rest_health_api, waku/waku_api/rest/health/handlers as rest_health_api,
../../waku/waku_api/rest/admin/handlers as rest_admin_api, waku/waku_api/rest/admin/handlers as rest_admin_api,
../../waku/waku_core/topics waku/waku_core/topics
## Monitoring and external interfaces ## Monitoring and external interfaces

2
waku/waku_api/rest/health/client.nim
View File

@ -2,7 +2,7 @@
import import
chronicles, json_serialization, json_serialization/std/options, presto/[route, client] chronicles, json_serialization, json_serialization/std/options, presto/[route, client]
import ./types, ../serdes, ../responses, ../rest_serdes, ../../waku/node/health_monitor import ./types, ../serdes, ../responses, ../rest_serdes, waku/node/health_monitor
logScope: logScope:
topics = "waku node rest health_api" topics = "waku node rest health_api"

2
waku/waku_api/rest/legacy_store/handlers.nim
View File

@ -1,6 +1,6 @@
{.push raises: [].} {.push raises: [].}
import std/strformat, stew/results, chronicles, uri, json_serialization, presto/route import std/strformat, results, chronicles, uri, json_serialization, presto/route
import import
../../../waku_core, ../../../waku_core,
../../../waku_store_legacy/common, ../../../waku_store_legacy/common,

4
waku/waku_api/rest/lightpush/handlers.nim
View File

@ -10,9 +10,9 @@ import
presto/common presto/common
import import
../../waku/node/peer_manager, waku/node/peer_manager,
waku/waku_lightpush/common,
../../../waku_node, ../../../waku_node,
../../waku/waku_lightpush/common,
../../handlers, ../../handlers,
../serdes, ../serdes,
../responses, ../responses,

2
waku/waku_api/rest/origin_handler.nim
View File

@ -2,7 +2,7 @@
import import
std/[options, strutils, re, net], std/[options, strutils, re, net],
stew/results, results,
chronicles, chronicles,
chronos, chronos,
chronos/apps/http/httpserver chronos/apps/http/httpserver

3
waku/waku_api/rest/relay/handlers.nim
View File

@ -2,7 +2,8 @@
import import
std/sequtils, std/sequtils,
stew/[byteutils, results], stew/byteutils,
results,
chronicles, chronicles,
json_serialization, json_serialization,
json_serialization/std/options, json_serialization/std/options,

2
waku/waku_api/rest/responses.nim
View File

@ -1,6 +1,6 @@
{.push raises: [].} {.push raises: [].}
import std/typetraits, stew/results, chronicles, presto/common import std/typetraits, results, chronicles, presto/common
import ./serdes import ./serdes
const MIMETYPE_JSON* = MediaType.init("application/json") const MIMETYPE_JSON* = MediaType.init("application/json")

2
waku/waku_api/rest/rest_serdes.nim
View File

@ -3,7 +3,7 @@
import import
std/typetraits, std/typetraits,
std/os, std/os,
stew/results, results,
chronicles, chronicles,
serialization, serialization,
json_serialization, json_serialization,

2
waku/waku_api/rest/serdes.nim
View File

@ -2,7 +2,7 @@
import import
std/typetraits, std/typetraits,
stew/results, results,
stew/byteutils, stew/byteutils,
chronicles, chronicles,
serialization, serialization,

2
waku/waku_api/rest/server.nim
View File

@ -2,7 +2,7 @@
import std/net import std/net
import import
stew/results, results,
chronicles, chronicles,
chronos, chronos,
chronos/apps/http/httpserver, chronos/apps/http/httpserver,

2
waku/waku_api/rest/store/handlers.nim
View File

@ -1,6 +1,6 @@
{.push raises: [].} {.push raises: [].}
import std/strformat, stew/results, chronicles, uri, json_serialization, presto/route import std/strformat, results, chronicles, uri, json_serialization, presto/route
import import
../../../waku_core, ../../../waku_core,
../../../waku_store/common, ../../../waku_store/common,

2
waku/waku_archive/common.nim
View File

@ -1,6 +1,6 @@
{.push raises: [].} {.push raises: [].}
import std/options, stew/results, stew/byteutils, stew/arrayops, nimcrypto/sha2 import std/options, results, stew/byteutils, stew/arrayops, nimcrypto/sha2
import ../waku_core, ../common/paging import ../waku_core, ../common/paging
## Waku message digest ## Waku message digest

2
waku/waku_archive/driver.nim
View File

@ -1,6 +1,6 @@
{.push raises: [].} {.push raises: [].}
import std/options, stew/results, chronos import std/options, results, chronos
import ../waku_core, ./common import ../waku_core, ./common
const DefaultPageSize*: uint = 25 const DefaultPageSize*: uint = 25

2
waku/waku_archive/driver/builder.nim
View File

@ -1,6 +1,6 @@
{.push raises: [].} {.push raises: [].}
import stew/results, chronicles, chronos import results, chronicles, chronos
import import
../driver, ../driver,
../../common/databases/dburl, ../../common/databases/dburl,

2
waku/waku_archive/driver/postgres_driver/migrations.nim
View File

@ -1,6 +1,6 @@
{.push raises: [].} {.push raises: [].}
import std/strutils, stew/results, chronicles, chronos import std/strutils, results, chronicles, chronos
import import
../../../common/databases/common, ../../../common/databases/common,
../../../../migrations/message_store_postgres/pg_migration_manager, ../../../../migrations/message_store_postgres/pg_migration_manager,

6
waku/waku_archive/driver/postgres_driver/postgres_driver.nim
View File

@ -2,10 +2,10 @@
import import
std/[nre, options, sequtils, strutils, strformat, times], std/[nre, options, sequtils, strutils, strformat, times],
stew/[results, byteutils, arrayops], stew/[byteutils, arrayops],
db_postgres, results,
postgres,
chronos, chronos,
db_connector/[postgres, db_common],
chronicles chronicles
import import
../../../common/error_handling, ../../../common/error_handling,

2
waku/waku_archive/driver/postgres_driver/postgres_healthcheck.nim
View File

@ -1,6 +1,6 @@
{.push raises: [].} {.push raises: [].}
import chronos, stew/results import chronos, results
import ../../../common/databases/db_postgres, ../../../common/error_handling import ../../../common/databases/db_postgres, ../../../common/error_handling
## Simple query to validate that the postgres is working and attending requests ## Simple query to validate that the postgres is working and attending requests

7
waku/waku_archive/driver/queue_driver/queue_driver.nim
View File

@ -1,6 +1,6 @@
{.push raises: [].} {.push raises: [].}
import std/options, stew/results, stew/sorted_set, chronicles, chronos import std/options, results, stew/sorted_set, chronicles, chronos
import ../../../waku_core, ../../common, ../../driver, ./index import ../../../waku_core, ../../common, ../../driver, ./index
logScope: logScope:
@ -9,7 +9,8 @@ logScope:
const QueueDriverDefaultMaxCapacity* = 25_000 const QueueDriverDefaultMaxCapacity* = 25_000
type type
QueryFilterMatcher = proc(index: Index, msg: WakuMessage): bool {.gcsafe, closure.} QueryFilterMatcher =
proc(index: Index, msg: WakuMessage): bool {.gcsafe, raises: [], closure.}
QueueDriver* = ref object of ArchiveDriver QueueDriver* = ref object of ArchiveDriver
## Bounded repository for indexed messages ## Bounded repository for indexed messages
@ -81,7 +82,7 @@ proc getPage(
forward: bool = true, forward: bool = true,
cursor: Option[Index] = none(Index), cursor: Option[Index] = none(Index),
predicate: QueryFilterMatcher = nil, predicate: QueryFilterMatcher = nil,
): QueueDriverGetPageResult = ): QueueDriverGetPageResult {.raises: [].} =
## Populate a single page in forward direction ## Populate a single page in forward direction
## Start at the `startCursor` (exclusive), or first entry (inclusive) if not defined. ## Start at the `startCursor` (exclusive), or first entry (inclusive) if not defined.
## Page size must not exceed `maxPageSize` ## Page size must not exceed `maxPageSize`

5
waku/waku_archive/driver/sqlite_driver/migrations.nim
View File

@ -1,10 +1,7 @@
{.push raises: [].} {.push raises: [].}
import import
std/[tables, strutils, os], std/[tables, strutils, os], results, chronicles, sqlite3_abi # sqlite3_column_int64
stew/results,
chronicles,
sqlite3_abi # sqlite3_column_int64
import ../../../common/databases/db_sqlite, ../../../common/databases/common import ../../../common/databases/db_sqlite, ../../../common/databases/common
logScope: logScope:

10
waku/waku_archive/driver/sqlite_driver/queries.nim
View File

@ -1,6 +1,6 @@
{.push raises: [].} {.push raises: [].}
import std/[options, sequtils], stew/[results, byteutils], sqlite3_abi import std/[options, sequtils], stew/byteutils, sqlite3_abi, results
import import
../../../common/databases/db_sqlite, ../../../common/databases/db_sqlite,
../../../common/databases/common, ../../../common/databases/common,
@ -261,7 +261,7 @@ proc selectAllMessages*(
db: SqliteDatabase db: SqliteDatabase
): DatabaseResult[ ): DatabaseResult[
seq[(PubsubTopic, WakuMessage, seq[byte], Timestamp, WakuMessageHash)] seq[(PubsubTopic, WakuMessage, seq[byte], Timestamp, WakuMessageHash)]
] = ] {.gcsafe.} =
## Retrieve all messages from the store. ## Retrieve all messages from the store.
var rows: seq[(PubsubTopic, WakuMessage, seq[byte], Timestamp, WakuMessageHash)] var rows: seq[(PubsubTopic, WakuMessage, seq[byte], Timestamp, WakuMessageHash)]
proc queryRowCallback(s: ptr sqlite3_stmt) = proc queryRowCallback(s: ptr sqlite3_stmt) =
@ -426,7 +426,7 @@ proc execSelectMessagesV2WithLimitStmt(
return ok() return ok()
else: else:
return err($sqlite3_errstr(v)) return err($sqlite3_errstr(v))
finally: except Exception, CatchableError:
# release implicit transaction # release implicit transaction
discard sqlite3_reset(s) # same return information as step discard sqlite3_reset(s) # same return information as step
discard sqlite3_clear_bindings(s) # no errors possible discard sqlite3_clear_bindings(s) # no errors possible
@ -497,7 +497,7 @@ proc execSelectMessageByHash(
return ok() return ok()
else: else:
return err($sqlite3_errstr(v)) return err($sqlite3_errstr(v))
finally: except Exception, CatchableError:
# release implicit transaction # release implicit transaction
discard sqlite3_reset(s) # same return information as step discard sqlite3_reset(s) # same return information as step
discard sqlite3_clear_bindings(s) # no errors possible discard sqlite3_clear_bindings(s) # no errors possible
@ -628,7 +628,7 @@ proc execSelectMessagesWithLimitStmt(
return ok() return ok()
else: else:
return err($sqlite3_errstr(v)) return err($sqlite3_errstr(v))
finally: except Exception, CatchableError:
# release implicit transaction # release implicit transaction
discard sqlite3_reset(s) # same return information as step discard sqlite3_reset(s) # same return information as step
discard sqlite3_clear_bindings(s) # no errors possible discard sqlite3_clear_bindings(s) # no errors possible

Some files were not shown because too many files have changed in this diff Show More