From 6765beee2caf138c1a584499b890ce759c5ebf0e Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Thu, 11 Dec 2025 22:03:36 +0100 Subject: [PATCH] chore: assorted bumps (#1351) --- .gitmodules | 19 +++++++------------ benchmarks/utils.nim | 5 ++--- codex/codex.nim | 2 +- codex/conf.nim | 4 ++-- codex/contracts/requests.nim | 2 +- codex/discovery.nim | 2 +- codex/nat.nim | 6 +++--- codex/sales/reservations.nim | 3 ++- codex/utils/addrutils.nim | 2 +- codex/utils/natutils.nim | 3 +-- tests/codex/testnat.nim | 2 +- tests/examples.nim | 2 +- vendor/lrucache.nim | 2 +- vendor/nim-bearssl | 2 +- vendor/nim-blscurve | 2 +- vendor/nim-codex-dht | 2 +- vendor/nim-contract-abi | 2 +- vendor/nim-http-utils | 2 +- vendor/nim-leopard | 2 +- vendor/nim-leveldbstatic | 2 +- vendor/nim-metrics | 2 +- vendor/nim-nat-traversal | 2 +- vendor/nim-nitro | 2 +- vendor/nim-presto | 2 +- vendor/nim-sqlite3-abi | 2 +- vendor/nim-stew | 2 +- vendor/nim-taskpools | 2 +- vendor/nim-testutils | 2 +- vendor/nim-websock | 2 +- vendor/nim-zlib | 2 +- vendor/stint | 2 +- vendor/upraises | 1 - 32 files changed, 42 insertions(+), 49 deletions(-) delete mode 160000 vendor/upraises diff --git a/.gitmodules b/.gitmodules index 5cc2bfab..0260b1c7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -37,22 +37,17 @@ path = vendor/nim-nitro url = https://github.com/status-im/nim-nitro.git ignore = untracked - branch = master + branch = main [submodule "vendor/questionable"] path = vendor/questionable url = https://github.com/status-im/questionable.git ignore = untracked - branch = master -[submodule "vendor/upraises"] - path = vendor/upraises - url = https://github.com/markspanbroek/upraises.git - ignore = untracked - branch = master + branch = main [submodule "vendor/asynctest"] path = vendor/asynctest url = https://github.com/status-im/asynctest.git ignore = untracked - branch = master + branch = main [submodule "vendor/nim-presto"] path = vendor/nim-presto url = https://github.com/status-im/nim-presto.git @@ -132,7 +127,7 @@ path = vendor/nim-websock url = https://github.com/status-im/nim-websock.git ignore = untracked - branch = master + branch = main [submodule "vendor/nim-contract-abi"] path = vendor/nim-contract-abi url = https://github.com/status-im/nim-contract-abi @@ -160,7 +155,7 @@ path = vendor/nim-taskpools url = https://github.com/status-im/nim-taskpools.git ignore = untracked - branch = master + branch = stable [submodule "vendor/nim-leopard"] path = vendor/nim-leopard url = https://github.com/status-im/nim-leopard.git @@ -225,9 +220,9 @@ path = vendor/nim-quic url = https://github.com/vacp2p/nim-quic.git ignore = untracked - branch = master + branch = main [submodule "vendor/nim-ngtcp2"] path = vendor/nim-ngtcp2 url = https://github.com/vacp2p/nim-ngtcp2.git ignore = untracked - branch = master + branch = main diff --git a/benchmarks/utils.nim b/benchmarks/utils.nim index af5cdc25..7bd0f2e0 100644 --- a/benchmarks/utils.nim +++ b/benchmarks/utils.nim @@ -41,19 +41,18 @@ template benchmark*(name: untyped, count: int, blk: untyped) = ) benchRuns[benchmarkName] = (runs.avg(), count) -template printBenchMarkSummaries*(printRegular=true, printTsv=true) = +template printBenchMarkSummaries*(printRegular = true, printTsv = true) = if printRegular: echo "" for k, v in benchRuns: echo "Benchmark average run ", v.avgTimeSec, " for ", v.count, " runs ", "for ", k - + if printTsv: echo "" echo "name", "\t", "avgTimeSec", "\t", "count" for k, v in benchRuns: echo k, "\t", v.avgTimeSec, "\t", v.count - import std/math func floorLog2*(x: int): int = diff --git a/codex/codex.nim b/codex/codex.nim index 682fe9b5..63f56c6b 100644 --- a/codex/codex.nim +++ b/codex/codex.nim @@ -12,6 +12,7 @@ import std/strutils import std/os import std/tables import std/cpuinfo +import std/net import pkg/chronos import pkg/taskpools @@ -21,7 +22,6 @@ import pkg/confutils import pkg/confutils/defs import pkg/nitro import pkg/stew/io2 -import pkg/stew/shims/net as stewnet import pkg/datastore import pkg/ethers except Rng import pkg/stew/io2 diff --git a/codex/conf.nim b/codex/conf.nim index cec9c11a..0e71b562 100644 --- a/codex/conf.nim +++ b/codex/conf.nim @@ -16,8 +16,10 @@ import std/terminal # Is not used in tests {.pop.} import std/options +import std/parseutils import std/strutils import std/typetraits +import std/net import pkg/chronos import pkg/chronicles/helpers @@ -27,8 +29,6 @@ import pkg/confutils/std/net import pkg/toml_serialization import pkg/metrics import pkg/metrics/chronos_httpserver -import pkg/stew/shims/net as stewnet -import pkg/stew/shims/parseutils import pkg/stew/byteutils import pkg/libp2p import pkg/ethers diff --git a/codex/contracts/requests.nim b/codex/contracts/requests.nim index 035e9648..f6f630e2 100644 --- a/codex/contracts/requests.nim +++ b/codex/contracts/requests.nim @@ -2,7 +2,7 @@ import std/hashes import std/sequtils import std/typetraits import pkg/contractabi -import pkg/nimcrypto +import pkg/nimcrypto/keccak import pkg/ethers/contracts/fields import pkg/questionable/results import pkg/stew/byteutils diff --git a/codex/discovery.nim b/codex/discovery.nim index 905f0902..4b555db1 100644 --- a/codex/discovery.nim +++ b/codex/discovery.nim @@ -10,13 +10,13 @@ {.push raises: [].} import std/algorithm +import std/net import std/sequtils import pkg/chronos import pkg/libp2p/[cid, multicodec, routing_record, signed_envelope] import pkg/questionable import pkg/questionable/results -import pkg/stew/shims/net import pkg/contractabi/address as ca import pkg/codexdht/discv5/[routing_table, protocol as discv5] from pkg/nimcrypto import keccak256 diff --git a/codex/nat.nim b/codex/nat.nim index d022dad6..2038ca3d 100644 --- a/codex/nat.nim +++ b/codex/nat.nim @@ -10,10 +10,10 @@ import std/[options, os, strutils, times, net, atomics], - stew/shims/net as stewNet, - stew/[objects, results], + stew/[objects], nat_traversal/[miniupnpc, natpmp], - json_serialization/std/net + json_serialization/std/net, + results import pkg/chronos import pkg/chronicles diff --git a/codex/sales/reservations.nim b/codex/sales/reservations.nim index 627ef6bb..8ab16105 100644 --- a/codex/sales/reservations.nim +++ b/codex/sales/reservations.nim @@ -36,7 +36,6 @@ import std/sequtils import std/times import pkg/chronos import pkg/datastore -import pkg/nimcrypto import pkg/questionable import pkg/questionable/results import pkg/stint @@ -53,6 +52,8 @@ import ../units export requests export logutils +from nimcrypto import randomBytes + logScope: topics = "marketplace sales reservations" diff --git a/codex/utils/addrutils.nim b/codex/utils/addrutils.nim index cd9dbd0e..641ad9d4 100644 --- a/codex/utils/addrutils.nim +++ b/codex/utils/addrutils.nim @@ -9,11 +9,11 @@ {.push raises: [], gcsafe.} +import std/net import std/strutils import std/options import pkg/libp2p -import pkg/stew/shims/net import pkg/stew/endians2 func remapAddr*( diff --git a/codex/utils/natutils.nim b/codex/utils/natutils.nim index 996d8dd0..45ad7589 100644 --- a/codex/utils/natutils.nim +++ b/codex/utils/natutils.nim @@ -1,7 +1,6 @@ {.push raises: [].} -import - std/[tables, hashes], pkg/results, pkg/stew/shims/net as stewNet, chronos, chronicles +import std/[net, tables, hashes], pkg/results, chronos, chronicles import pkg/libp2p diff --git a/tests/codex/testnat.nim b/tests/codex/testnat.nim index 3981b2e6..a4161c6f 100644 --- a/tests/codex/testnat.nim +++ b/tests/codex/testnat.nim @@ -1,4 +1,4 @@ -import std/[unittest, options, net], stew/shims/net as stewNet +import std/[unittest, options, net] import pkg/chronos import pkg/libp2p/[multiaddress, multihash, multicodec] import pkg/results diff --git a/tests/examples.nim b/tests/examples.nim index 9ef4e292..2b7e96d6 100644 --- a/tests/examples.nim +++ b/tests/examples.nim @@ -38,7 +38,7 @@ proc example*[T](_: type seq[T]): seq[T] = newSeqWith(length, T.example) proc example*(_: type UInt256): UInt256 = - UInt256.fromBytes(array[32, byte].example) + UInt256.fromBytesBE(array[32, byte].example) proc example*[T: distinct](_: type T): T = type baseType = T.distinctBase diff --git a/vendor/lrucache.nim b/vendor/lrucache.nim index 8767ade0..ba577369 160000 --- a/vendor/lrucache.nim +++ b/vendor/lrucache.nim @@ -1 +1 @@ -Subproject commit 8767ade0b76ea5b5d4ce24a52d0c58a6ebeb66cd +Subproject commit ba57736921b2972163b673fc706e7659e7c5cbd6 diff --git a/vendor/nim-bearssl b/vendor/nim-bearssl index 667b4044..ff43a1da 160000 --- a/vendor/nim-bearssl +++ b/vendor/nim-bearssl @@ -1 +1 @@ -Subproject commit 667b40440a53a58e9f922e29e20818720c62d9ac +Subproject commit ff43a1dad1af1cc4bd928c243a1c0470a315aa2c diff --git a/vendor/nim-blscurve b/vendor/nim-blscurve index de2d3c79..f4d0de2e 160000 --- a/vendor/nim-blscurve +++ b/vendor/nim-blscurve @@ -1 +1 @@ -Subproject commit de2d3c79264bba18dbea469c8c5c4b3bb3c8bc55 +Subproject commit f4d0de2eece20380541fbf73d4b8bf57dc214b3b diff --git a/vendor/nim-codex-dht b/vendor/nim-codex-dht index f6eef1ac..6c7de036 160000 --- a/vendor/nim-codex-dht +++ b/vendor/nim-codex-dht @@ -1 +1 @@ -Subproject commit f6eef1ac95c70053b2518f1e3909c909ed8701a6 +Subproject commit 6c7de036224724b064dcaa6b1d898be1c6d03242 diff --git a/vendor/nim-contract-abi b/vendor/nim-contract-abi index 842f4891..0a7b4cec 160000 --- a/vendor/nim-contract-abi +++ b/vendor/nim-contract-abi @@ -1 +1 @@ -Subproject commit 842f48910be4f388bcbf8abf1f02aba1d5e2ee64 +Subproject commit 0a7b4cecce725bcb11ad8648035a92704a8854d3 diff --git a/vendor/nim-http-utils b/vendor/nim-http-utils index 8bb1acba..c53852d9 160000 --- a/vendor/nim-http-utils +++ b/vendor/nim-http-utils @@ -1 +1 @@ -Subproject commit 8bb1acbaa4b86eb866145b0d468eff64a57d1897 +Subproject commit c53852d9e24205b6363bba517fa8ee7bde823691 diff --git a/vendor/nim-leopard b/vendor/nim-leopard index 7506b90f..0478b12d 160000 --- a/vendor/nim-leopard +++ b/vendor/nim-leopard @@ -1 +1 @@ -Subproject commit 7506b90f9c650c02b96bf525d4fd1bd4942a495f +Subproject commit 0478b12df90cbbe531efa69422cff67b5a3a5d93 diff --git a/vendor/nim-leveldbstatic b/vendor/nim-leveldbstatic index 378ef63e..5a0cd8de 160000 --- a/vendor/nim-leveldbstatic +++ b/vendor/nim-leveldbstatic @@ -1 +1 @@ -Subproject commit 378ef63e261e3b5834a3567404edc3ce838498b3 +Subproject commit 5a0cd8de6b2363827c43cafd3ed346ecee427e1e diff --git a/vendor/nim-metrics b/vendor/nim-metrics index cacfdc12..9b9afee9 160000 --- a/vendor/nim-metrics +++ b/vendor/nim-metrics @@ -1 +1 @@ -Subproject commit cacfdc12454a0804c65112b9f4f50d1375208dcd +Subproject commit 9b9afee96357ad82dabf4563cf292f89b50423df diff --git a/vendor/nim-nat-traversal b/vendor/nim-nat-traversal index 6508ce75..860e18c3 160000 --- a/vendor/nim-nat-traversal +++ b/vendor/nim-nat-traversal @@ -1 +1 @@ -Subproject commit 6508ce75060878dfcdfa21f94721672c69a1823b +Subproject commit 860e18c37667b5dd005b94c63264560c35d88004 diff --git a/vendor/nim-nitro b/vendor/nim-nitro index e3719433..5ccdeb46 160000 --- a/vendor/nim-nitro +++ b/vendor/nim-nitro @@ -1 +1 @@ -Subproject commit e3719433d5ace25947c468787c805969642b3913 +Subproject commit 5ccdeb46e06dcf5cef80d0acbb80ee8a17d596e7 diff --git a/vendor/nim-presto b/vendor/nim-presto index 92b1c7ff..62225bfa 160000 --- a/vendor/nim-presto +++ b/vendor/nim-presto @@ -1 +1 @@ -Subproject commit 92b1c7ff141e6920e1f8a98a14c35c1fa098e3be +Subproject commit 62225bfa7ce703a99e04680bfc3498e69b52897f diff --git a/vendor/nim-sqlite3-abi b/vendor/nim-sqlite3-abi index 05bbff1a..6797c318 160000 --- a/vendor/nim-sqlite3-abi +++ b/vendor/nim-sqlite3-abi @@ -1 +1 @@ -Subproject commit 05bbff1af4e8fe2d972ba4b0667b89ca94d3ebba +Subproject commit 6797c31836bff377bf50f1ac7bf8122449bf99ba diff --git a/vendor/nim-stew b/vendor/nim-stew index a6e19813..b6616873 160000 --- a/vendor/nim-stew +++ b/vendor/nim-stew @@ -1 +1 @@ -Subproject commit a6e198132097fb544d04959aeb3b839e1408f942 +Subproject commit b66168735d6f3841c5239c3169d3fe5fe98b1257 diff --git a/vendor/nim-taskpools b/vendor/nim-taskpools index 66585e2e..4acdc6ef 160000 --- a/vendor/nim-taskpools +++ b/vendor/nim-taskpools @@ -1 +1 @@ -Subproject commit 66585e2e960b7695e48ea60377fb3aeac96406e8 +Subproject commit 4acdc6ef005a93dba09f902ed75197548cf7b451 diff --git a/vendor/nim-testutils b/vendor/nim-testutils index 4d37244f..e4d37dc1 160000 --- a/vendor/nim-testutils +++ b/vendor/nim-testutils @@ -1 +1 @@ -Subproject commit 4d37244f9f5e1acd8592a4ceb5c3fc47bc160181 +Subproject commit e4d37dc1652d5c63afb89907efb5a5e812261797 diff --git a/vendor/nim-websock b/vendor/nim-websock index ebe308a7..35ae76f1 160000 --- a/vendor/nim-websock +++ b/vendor/nim-websock @@ -1 +1 @@ -Subproject commit ebe308a79a7b440a11dfbe74f352be86a3883508 +Subproject commit 35ae76f1559e835c80f9c1a3943bf995d3dd9eb5 diff --git a/vendor/nim-zlib b/vendor/nim-zlib index 91cf360b..c71efff5 160000 --- a/vendor/nim-zlib +++ b/vendor/nim-zlib @@ -1 +1 @@ -Subproject commit 91cf360b1aeb2e0c753ff8bac6de22a41c5ed8cd +Subproject commit c71efff5fd1721362b3363dc7d0e2a4c0dbc6453 diff --git a/vendor/stint b/vendor/stint index 5c5e01ce..470b7892 160000 --- a/vendor/stint +++ b/vendor/stint @@ -1 +1 @@ -Subproject commit 5c5e01cef089a261474b7abfe246b37447aaa8ed +Subproject commit 470b7892561b5179ab20bd389a69217d6213fe58 diff --git a/vendor/upraises b/vendor/upraises deleted file mode 160000 index bc262898..00000000 --- a/vendor/upraises +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bc2628989b63854d980e92dadbd58f83e34b6f25