Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: codex-storage/nim-codex-dht
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a7f14bc9b783f1b9e2d02cc85a338b1411058095
Choose a base ref
...
head repository: codex-storage/nim-codex-dht
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 63822e83561ea1c6396d0f3eca583b038f5d44c6
Choose a head ref
  • 7 commits
  • 8 files changed
  • 2 contributors

Commits on Nov 22, 2023

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    beefafc View commit details

Commits on Mar 18, 2024

  1. update repo for libp2p

    gmega committed Mar 18, 2024

    Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    b3d0124 View commit details
  2. fix name for nimble archive for OSX

    gmega committed Mar 18, 2024

    Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    709a873 View commit details
  3. Merge pull request #92 from codex-storage/fix/nimble-archive-osx

    fix name for nimble archive for OSX
    gmega authored Mar 18, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    223ce92 View commit details
  4. Merge branch 'master' into chore/update-libp2p-repo

    gmega committed Mar 18, 2024

    Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    717cd0a View commit details
  5. Merge pull request #91 from codex-storage/chore/update-libp2p-repo

    Update repo for libp2p
    gmega authored Mar 18, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    2299317 View commit details

Commits on May 23, 2024

  1. Update nim-codex-dht to Chronos V4 (#90)

    Update nim-codex-dht to Chronos v4
    gmega authored May 23, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    63822e8 View commit details
2 changes: 1 addition & 1 deletion .github/actions/install_nimble/action.yml
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ runs:
fi
if [[ '${{ inputs.os }}' == 'macos' ]]; then
OS=apple
OS=macosx
else
OS='${{ inputs.os }}'
fi
256 changes: 171 additions & 85 deletions atlas.lock
Original file line number Diff line number Diff line change
@@ -1,144 +1,230 @@
{
"items": {
"nim-zlib": {
"dir": "vendor/nim-zlib",
"zlib": {
"dir": "$deps/nim-zlib",
"url": "https://github.com/status-im/nim-zlib",
"commit": "f34ca261efd90f118dc1647beefd2f7a69b05d93"
"commit": "a2f44bb7f65571a894227ff6fde9298a104e03a5",
"version": "0.1.0"
},
"nim-stew": {
"dir": "vendor/nim-stew",
"stew": {
"dir": "$deps/nim-stew",
"url": "https://github.com/status-im/nim-stew",
"commit": "7afe7e3c070758cac1f628e4330109f3ef6fc853"
"commit": "2c2544aec13536304438be045bfdd22452741466",
"version": "0.1.0"
},
"nim-http-utils": {
"dir": "vendor/nim-http-utils",
"httputils": {
"dir": "$deps/nim-http-utils",
"url": "https://github.com/status-im/nim-http-utils",
"commit": "3b491a40c60aad9e8d3407443f46f62511e63b18"
"commit": "77a59297ad635d91a6352ef48ee09c6bde0c5d86",
"version": "0.3.0"
},
"nim-chronos": {
"dir": "vendor/nim-chronos",
"chronos": {
"dir": "$deps/nim-chronos",
"url": "https://github.com/status-im/nim-chronos",
"commit": "0277b65be2c7a365ac13df002fba6e172be55537"
"commit": "e15dc3b41fea95348b58f32244962c1c6df310a7",
"version": "3.2.0"
},
"upraises": {
"dir": "vendor/upraises",
"dir": "$deps/upraises",
"url": "https://github.com/markspanbroek/upraises",
"commit": "ff4f8108e44fba9b35cac535ab63d3927e8fd3c2"
"commit": "bc2628989b63854d980e92dadbd58f83e34b6f25",
"version": "0.1.0"
},
"nim-sqlite3-abi": {
"dir": "vendor/nim-sqlite3-abi",
"sqlite3_abi": {
"dir": "$deps/nim-sqlite3-abi",
"url": "https://github.com/arnetheduck/nim-sqlite3-abi",
"commit": "362e1bd9f689ad9f5380d9d27f0705b3d4dfc7d3"
"commit": "362e1bd9f689ad9f5380d9d27f0705b3d4dfc7d3",
"version": "3.40.1.1"
},
"questionable": {
"dir": "vendor/questionable",
"dir": "$deps/questionable",
"url": "https://github.com/codex-storage/questionable",
"commit": "b3cf35ac450fd42c9ea83dc084f5cba2efc55da3"
"commit": "1f0afff48bf80ab1149a0957f9743f345bc14b71",
"version": "0.10.12"
},
"nim-results": {
"dir": "vendor/nim-results",
"url": "https://github.com/arnetheduck/nim-results",
"commit": "f3c666a272c69d70cb41e7245e7f6844797303ad"
},
"nim-unittest2": {
"dir": "vendor/nim-unittest2",
"url": "https://github.com/status-im/nim-unittest2",
"commit": "b178f47527074964f76c395ad0dfc81cf118f379"
},
"nim-websock": {
"dir": "vendor/nim-websock",
"websock": {
"dir": "$deps/nim-websock",
"url": "https://github.com/status-im/nim-websock",
"commit": "2c3ae3137f3c9cb48134285bd4a47186fa51f0e8"
"commit": "f8ed9b40a5ff27ad02a3c237c4905b0924e3f982",
"version": "0.1.0"
},
"nim-secp256k1": {
"dir": "vendor/nim-secp256k1",
"secp256k1": {
"dir": "$deps/nim-secp256k1",
"url": "https://github.com/status-im/nim-secp256k1",
"commit": "2acbbdcc0e63002a013fff49f015708522875832"
"commit": "7246d91c667f4cc3759fdd50339caa45a2ecd8be",
"version": "0.6.0.3.2"
},
"nim-bearssl": {
"dir": "vendor/nim-bearssl",
"bearssl": {
"dir": "$deps/nim-bearssl",
"url": "https://github.com/status-im/nim-bearssl",
"commit": "99fcb3405c55b27cfffbf60f5368c55da7346f23"
"commit": "d55d3a86d7ec3ad11b244e17b3bad490bfbd076d",
"version": "0.2.1"
},
"dnsclient.nim": {
"dir": "vendor/dnsclient.nim",
"dnsclient": {
"dir": "$deps/dnsclient.nim",
"url": "https://github.com/ba0f3/dnsclient.nim",
"commit": "23214235d4784d24aceed99bbfe153379ea557c8"
"commit": "23214235d4784d24aceed99bbfe153379ea557c8",
"version": "0.3.4"
},
"nimcrypto": {
"dir": "vendor/nimcrypto",
"dir": "$deps/nimcrypto",
"url": "https://github.com/status-im/nimcrypto",
"commit": "24e006df85927f64916e60511620583b11403178"
"commit": "24e006df85927f64916e60511620583b11403178",
"version": "0.5.4"
},
"nim-json-serialization": {
"dir": "vendor/nim-json-serialization",
"results": {
"dir": "$deps/nim-results",
"url": "https://github.com/arnetheduck/nim-results",
"commit": "113d433f48894ee8e7da3e340c8fe19ad7b9db4d",
"version": "0.4.0"
},
"json_serialization": {
"dir": "$deps/nim-json-serialization",
"url": "https://github.com/status-im/nim-json-serialization",
"commit": "bb53d49caf2a6c6cf1df365ba84af93cdcfa7aa3"
"commit": "3f1ce24ee116daedbc9c8be525e63ec03e185a28",
"version": "0.2.2"
},
"nim-testutils": {
"dir": "vendor/nim-testutils",
"testutils": {
"dir": "$deps/nim-testutils",
"url": "https://github.com/status-im/nim-testutils",
"commit": "b56a5953e37fc5117bd6ea6dfa18418c5e112815"
"commit": "b56a5953e37fc5117bd6ea6dfa18418c5e112815",
"version": "0.5.0"
},
"unittest2": {
"dir": "$deps/nim-unittest2",
"url": "https://github.com/status-im/nim-unittest2",
"commit": "262b697f38d6b6f1e7462d3b3ab81d79b894e336",
"version": "0.2.1"
},
"npeg": {
"dir": "vendor/npeg",
"dir": "$deps/npeg",
"url": "https://github.com/zevv/npeg",
"commit": "b15a10e388b91b898c581dbbcb6a718d46b27d2f"
"commit": "b9051a64376d277912ec7616bbb21688754160c7",
"version": "1.2.1"
},
"nim-serialization": {
"dir": "vendor/nim-serialization",
"serialization": {
"dir": "$deps/nim-serialization",
"url": "https://github.com/status-im/nim-serialization",
"commit": "384eb2561ee755446cff512a8e057325848b86a7"
"commit": "4d541ec43454809904fc4c3c0a7436410ad597d2",
"version": "0.2.2"
},
"nim-faststreams": {
"dir": "vendor/nim-faststreams",
"faststreams": {
"dir": "$deps/nim-faststreams",
"url": "https://github.com/status-im/nim-faststreams",
"commit": "720fc5e5c8e428d9d0af618e1e27c44b42350309"
"commit": "720fc5e5c8e428d9d0af618e1e27c44b42350309",
"version": "0.3.0"
},
"nim-datastore": {
"dir": "vendor/nim-datastore",
"datastore": {
"dir": "$deps/nim-datastore",
"url": "https://github.com/codex-storage/nim-datastore",
"commit": "0cde8aeb67c59fd0ac95496dc6b5e1168d6632aa"
"commit": "cadf38db576a2cf6145188f285f042e56aad7c91",
"version": "0.0.1"
},
"asynctest": {
"dir": "vendor/asynctest",
"url": "https://github.com/codex-storage/asynctest",
"commit": "fe1a34caf572b05f8bdba3b650f1871af9fce31e"
"dir": "$deps/asynctest",
"url": "https://github.com/markspanbroek/asynctest",
"commit": "c9423b198f1a7fad128396ffaaa92077a1dda869",
"version": "0.4.3"
},
"nim-stint": {
"dir": "vendor/nim-stint",
"stint": {
"dir": "$deps/nim-stint",
"url": "https://github.com/status-im/nim-stint",
"commit": "86621eced1dcfb5e25903019ebcfc76ed9128ec5"
"commit": "711cda4456c32d3ba3c6c4524135b3453dffeb9c",
"version": "2.0.0"
},
"nim-metrics": {
"dir": "vendor/nim-metrics",
"metrics": {
"dir": "$deps/nim-metrics",
"url": "https://github.com/status-im/nim-metrics",
"commit": "6142e433fc8ea9b73379770a788017ac528d46ff"
"commit": "51f1227d0fd04ce84b1ef784b11280cb7875348c",
"version": "0.0.1"
},
"nim-libp2p": {
"dir": "vendor/nim-libp2p",
"libp2p": {
"dir": "$deps/nim-libp2p",
"url": "https://github.com/status-im/nim-libp2p",
"commit": "440461b24b9e66542b34d26a0b908c17f6549d05"
"commit": "e3c967ad1939fb33b8e13759037d193734acd202",
"version": "1.1.0"
},
"nim-chronicles": {
"dir": "vendor/nim-chronicles",
"chronicles": {
"dir": "$deps/nim-chronicles",
"url": "https://github.com/status-im/nim-chronicles",
"commit": "c9c8e58ec3f89b655a046c485f622f9021c68b61"
"commit": "ccbb7566d1a06bfc1ec42dd8da74a47f1d3b3f4b",
"version": "0.10.3"
},
"nim-protobuf-serialization": {
"dir": "vendor/nim-protobuf-serialization",
"protobuf_serialization": {
"dir": "$deps/nim-protobuf-serialization",
"url": "https://github.com/status-im/nim-protobuf-serialization",
"commit": "28214b3e40c755a9886d2ec8f261ec48fbb6bec6"
"commit": "5a31137a82c2b6a989c9ed979bb636c7a49f570e",
"version": "0.3.0"
}
},
"nimcfg": "############# begin Atlas config section ##########\n--noNimblePath\n--path:\"vendor/nim-secp256k1\"\n--path:\"vendor/nim-protobuf-serialization\"\n--path:\"vendor/nimcrypto\"\n--path:\"vendor/nim-bearssl\"\n--path:\"vendor/nim-chronicles\"\n--path:\"vendor/nim-chronos\"\n--path:\"vendor/nim-libp2p\"\n--path:\"vendor/nim-metrics\"\n--path:\"vendor/nim-stew\"\n--path:\"vendor/nim-stint\"\n--path:\"vendor/asynctest\"\n--path:\"vendor/nim-datastore\"\n--path:\"vendor/questionable\"\n--path:\"vendor/nim-faststreams\"\n--path:\"vendor/nim-serialization\"\n--path:\"vendor/npeg/src\"\n--path:\"vendor/nim-unittest2\"\n--path:\"vendor/nim-testutils\"\n--path:\"vendor/nim-json-serialization\"\n--path:\"vendor/nim-http-utils\"\n--path:\"vendor/dnsclient.nim/src\"\n--path:\"vendor/nim-websock\"\n--path:\"vendor/nim-results\"\n--path:\"vendor/nim-sqlite3-abi\"\n--path:\"vendor/upraises\"\n--path:\"vendor/nim-zlib\"\n############# end Atlas config section ##########\n",
"nimcfg": [
"############# begin Atlas config section ##########",
"--noNimblePath",
"--path:\"vendor/nim-unittest2\"",
"--path:\"vendor/nim-secp256k1\"",
"--path:\"vendor/nim-protobuf-serialization\"",
"--path:\"vendor/nimcrypto\"",
"--path:\"vendor/nim-bearssl\"",
"--path:\"vendor/nim-chronicles\"",
"--path:\"vendor/nim-chronos\"",
"--path:\"vendor/nim-libp2p\"",
"--path:\"vendor/nim-metrics\"",
"--path:\"vendor/nim-stew\"",
"--path:\"vendor/nim-stint\"",
"--path:\"vendor/asynctest\"",
"--path:\"vendor/nim-datastore\"",
"--path:\"vendor/questionable\"",
"--path:\"vendor/nim-faststreams\"",
"--path:\"vendor/nim-serialization\"",
"--path:\"vendor/npeg/src\"",
"--path:\"vendor/nim-testutils\"",
"--path:\"vendor/nim-json-serialization\"",
"--path:\"vendor/nim-results\"",
"--path:\"vendor/nim-http-utils\"",
"--path:\"vendor/dnsclient.nim/src\"",
"--path:\"vendor/nim-websock\"",
"--path:\"vendor/nim-sqlite3-abi\"",
"--path:\"vendor/upraises\"",
"--path:\"vendor/nim-zlib\"",
"############# end Atlas config section ##########",
""
],
"nimbleFile": {
"filename": "",
"content": "# Package\n\nversion = \"0.3.2\"\nauthor = \"Status Research & Development GmbH\"\ndescription = \"DHT based on the libp2p Kademlia spec\"\nlicense = \"MIT\"\nskipDirs = @[\"tests\"]\n\n\n# Dependencies\nrequires \"nim >= 1.2.0\"\nrequires \"secp256k1#2acbbdcc0e63002a013fff49f015708522875832\" # >= 0.5.2 & < 0.6.0\nrequires \"protobuf_serialization\" # >= 0.2.0 & < 0.3.0\nrequires \"nimcrypto == 0.5.4\"\nrequires \"bearssl#head\"\nrequires \"chronicles >= 0.10.2 & < 0.11.0\"\nrequires \"chronos == 3.2.0\" # >= 3.0.11 & < 3.1.0\nrequires \"libp2p#unstable\"\nrequires \"metrics\"\nrequires \"stew#head\"\nrequires \"stint\"\nrequires \"asynctest >= 0.3.1 & < 0.4.0\"\nrequires \"https://github.com/codex-storage/nim-datastore#head\"\nrequires \"questionable\"\n\ninclude \"build.nims\"\n\n"
"filename": "codexdht.nimble",
"content": [
"# Package",
"",
"version = \"0.4.0\"",
"author = \"Status Research & Development GmbH\"",
"description = \"DHT based on Eth discv5 implementation\"",
"license = \"MIT\"",
"skipDirs = @[\"tests\"]",
"installFiles = @[\"build.nims\"]",
"",
"# Dependencies",
"requires \"nim >= 1.6.18\"",
"requires \"unittest2 <= 0.0.9\"",
"requires \"secp256k1#2acbbdcc0e63002a013fff49f015708522875832\" # >= 0.5.2 & < 0.6.0",
"requires \"protobuf_serialization\" # >= 0.2.0 & < 0.3.0",
"requires \"nimcrypto >= 0.5.4\"",
"requires \"bearssl#head\"",
"requires \"chronicles >= 0.10.2 & < 0.11.0\"",
"requires \"chronos#e15dc3b41fea95348b58f32244962c1c6df310a7\" # Change to >= 4.0.0 & < 5.0.0 when available",
"requires \"libp2p#unstable\"",
"requires \"metrics\"",
"requires \"stew#head\"",
"requires \"stint\"",
"requires \"asynctest >= 0.4.3 & < 0.5.0\"",
"requires \"https://github.com/codex-storage/nim-datastore#head\"",
"requires \"questionable\"",
"",
"include \"build.nims\"",
" "
]
},
"hostOS": "macosx",
"hostCPU": "arm64",
"nimVersion": "1.6.14",
"gccVersion": "",
"hostOS": "linux",
"hostCPU": "amd64",
"nimVersion": "1.6.18 a749a8b742bd0a4272c26a65517275db4720e58a",
"gccVersion": "11.4.0",
"clangVersion": ""
}
10 changes: 6 additions & 4 deletions codexdht.nimble
Original file line number Diff line number Diff line change
@@ -8,19 +8,21 @@ skipDirs = @["tests"]
installFiles = @["build.nims"]

# Dependencies
requires "nim >= 1.2.0"
requires "nim >= 1.6.18"
requires "unittest2 <= 0.0.9"
requires "secp256k1#2acbbdcc0e63002a013fff49f015708522875832" # >= 0.5.2 & < 0.6.0
requires "protobuf_serialization" # >= 0.2.0 & < 0.3.0
requires "nimcrypto == 0.5.4"
requires "nimcrypto >= 0.5.4"
requires "bearssl#head"
requires "chronicles >= 0.10.2 & < 0.11.0"
requires "chronos == 3.2.0" # >= 3.0.11 & < 3.1.0
requires "chronos#e15dc3b41fea95348b58f32244962c1c6df310a7" # Change to >= 4.0.0 & < 5.0.0 when available
requires "libp2p#unstable"
requires "metrics"
requires "stew#head"
requires "stint"
requires "asynctest >= 0.3.1 & < 0.4.0"
requires "asynctest >= 0.4.3 & < 0.5.0"
requires "https://github.com/codex-storage/nim-datastore#head"
requires "questionable"

include "build.nims"

Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ import ./common

const
ExpiredCleanupBatch* = 1000
CleanupInterval* = 5.minutes
CleanupInterval* = 24.hours

proc cleanupExpired*(
store: Datastore,
Loading