diff options
| -rw-r--r-- | Cargo.lock | 380 | ||||
| -rw-r--r-- | Cargo.toml | 12 | ||||
| -rw-r--r-- | src/lib/client.rs | 16 | ||||
| -rw-r--r-- | src/lib/git/nostr_url.rs | 1 | ||||
| -rw-r--r-- | src/lib/login/fresh.rs | 1 | ||||
| -rw-r--r-- | test_utils/Cargo.toml | 8 | ||||
| -rw-r--r-- | test_utils/src/lib.rs | 2 | ||||
| -rw-r--r-- | test_utils/src/relay.rs | 8 |
8 files changed, 55 insertions, 373 deletions
| @@ -269,12 +269,6 @@ dependencies = [ | |||
| 269 | 269 | ||
| 270 | [[package]] | 270 | [[package]] |
| 271 | name = "bitflags" | 271 | name = "bitflags" |
| 272 | version = "1.3.2" | ||
| 273 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 274 | checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" | ||
| 275 | |||
| 276 | [[package]] | ||
| 277 | name = "bitflags" | ||
| 278 | version = "2.9.1" | 272 | version = "2.9.1" |
| 279 | source = "registry+https://github.com/rust-lang/crates.io-index" | 273 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 280 | checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" | 274 | checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" |
| @@ -356,12 +350,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
| 356 | checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" | 350 | checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" |
| 357 | 351 | ||
| 358 | [[package]] | 352 | [[package]] |
| 359 | name = "cfg_aliases" | ||
| 360 | version = "0.2.1" | ||
| 361 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 362 | checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" | ||
| 363 | |||
| 364 | [[package]] | ||
| 365 | name = "chacha20" | 353 | name = "chacha20" |
| 366 | version = "0.9.1" | 354 | version = "0.9.1" |
| 367 | source = "registry+https://github.com/rust-lang/crates.io-index" | 355 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| @@ -643,11 +631,11 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" | |||
| 643 | 631 | ||
| 644 | [[package]] | 632 | [[package]] |
| 645 | name = "flatbuffers" | 633 | name = "flatbuffers" |
| 646 | version = "23.5.26" | 634 | version = "25.2.10" |
| 647 | source = "registry+https://github.com/rust-lang/crates.io-index" | 635 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 648 | checksum = "4dac53e22462d78c16d64a1cd22371b54cc3fe94aa15e7886a2fa6e5d1ab8640" | 636 | checksum = "1045398c1bfd89168b5fd3f1fc11f6e70b34f6f66300c87d44d3de849463abf1" |
| 649 | dependencies = [ | 637 | dependencies = [ |
| 650 | "bitflags 1.3.2", | 638 | "bitflags", |
| 651 | "rustc_version", | 639 | "rustc_version", |
| 652 | ] | 640 | ] |
| 653 | 641 | ||
| @@ -804,11 +792,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
| 804 | checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" | 792 | checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" |
| 805 | dependencies = [ | 793 | dependencies = [ |
| 806 | "cfg-if", | 794 | "cfg-if", |
| 807 | "js-sys", | ||
| 808 | "libc", | 795 | "libc", |
| 809 | "r-efi", | 796 | "r-efi", |
| 810 | "wasi 0.14.2+wasi-0.2.4", | 797 | "wasi 0.14.2+wasi-0.2.4", |
| 811 | "wasm-bindgen", | ||
| 812 | ] | 798 | ] |
| 813 | 799 | ||
| 814 | [[package]] | 800 | [[package]] |
| @@ -823,7 +809,7 @@ version = "0.20.2" | |||
| 823 | source = "registry+https://github.com/rust-lang/crates.io-index" | 809 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 824 | checksum = "2deb07a133b1520dc1a5690e9bd08950108873d7ed5de38dcc74d3b5ebffa110" | 810 | checksum = "2deb07a133b1520dc1a5690e9bd08950108873d7ed5de38dcc74d3b5ebffa110" |
| 825 | dependencies = [ | 811 | dependencies = [ |
| 826 | "bitflags 2.9.1", | 812 | "bitflags", |
| 827 | "libc", | 813 | "libc", |
| 828 | "libgit2-sys", | 814 | "libgit2-sys", |
| 829 | "log", | 815 | "log", |
| @@ -862,7 +848,7 @@ version = "0.20.5" | |||
| 862 | source = "registry+https://github.com/rust-lang/crates.io-index" | 848 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 863 | checksum = "7d4f449bab7320c56003d37732a917e18798e2f1709d80263face2b4f9436ddb" | 849 | checksum = "7d4f449bab7320c56003d37732a917e18798e2f1709d80263face2b4f9436ddb" |
| 864 | dependencies = [ | 850 | dependencies = [ |
| 865 | "bitflags 2.9.1", | 851 | "bitflags", |
| 866 | "byteorder", | 852 | "byteorder", |
| 867 | "heed-traits", | 853 | "heed-traits", |
| 868 | "heed-types", | 854 | "heed-types", |
| @@ -937,95 +923,12 @@ dependencies = [ | |||
| 937 | ] | 923 | ] |
| 938 | 924 | ||
| 939 | [[package]] | 925 | [[package]] |
| 940 | name = "http-body" | ||
| 941 | version = "1.0.1" | ||
| 942 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 943 | checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" | ||
| 944 | dependencies = [ | ||
| 945 | "bytes", | ||
| 946 | "http 1.3.1", | ||
| 947 | ] | ||
| 948 | |||
| 949 | [[package]] | ||
| 950 | name = "http-body-util" | ||
| 951 | version = "0.1.3" | ||
| 952 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 953 | checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" | ||
| 954 | dependencies = [ | ||
| 955 | "bytes", | ||
| 956 | "futures-core", | ||
| 957 | "http 1.3.1", | ||
| 958 | "http-body", | ||
| 959 | "pin-project-lite", | ||
| 960 | ] | ||
| 961 | |||
| 962 | [[package]] | ||
| 963 | name = "httparse" | 926 | name = "httparse" |
| 964 | version = "1.10.1" | 927 | version = "1.10.1" |
| 965 | source = "registry+https://github.com/rust-lang/crates.io-index" | 928 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 966 | checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" | 929 | checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" |
| 967 | 930 | ||
| 968 | [[package]] | 931 | [[package]] |
| 969 | name = "hyper" | ||
| 970 | version = "1.6.0" | ||
| 971 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 972 | checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" | ||
| 973 | dependencies = [ | ||
| 974 | "bytes", | ||
| 975 | "futures-channel", | ||
| 976 | "futures-util", | ||
| 977 | "http 1.3.1", | ||
| 978 | "http-body", | ||
| 979 | "httparse", | ||
| 980 | "itoa", | ||
| 981 | "pin-project-lite", | ||
| 982 | "smallvec", | ||
| 983 | "tokio", | ||
| 984 | "want", | ||
| 985 | ] | ||
| 986 | |||
| 987 | [[package]] | ||
| 988 | name = "hyper-rustls" | ||
| 989 | version = "0.27.7" | ||
| 990 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 991 | checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" | ||
| 992 | dependencies = [ | ||
| 993 | "http 1.3.1", | ||
| 994 | "hyper", | ||
| 995 | "hyper-util", | ||
| 996 | "rustls", | ||
| 997 | "rustls-pki-types", | ||
| 998 | "tokio", | ||
| 999 | "tokio-rustls", | ||
| 1000 | "tower-service", | ||
| 1001 | "webpki-roots 1.0.2", | ||
| 1002 | ] | ||
| 1003 | |||
| 1004 | [[package]] | ||
| 1005 | name = "hyper-util" | ||
| 1006 | version = "0.1.16" | ||
| 1007 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 1008 | checksum = "8d9b05277c7e8da2c93a568989bb6207bef0112e8d17df7a6eda4a3cf143bc5e" | ||
| 1009 | dependencies = [ | ||
| 1010 | "base64", | ||
| 1011 | "bytes", | ||
| 1012 | "futures-channel", | ||
| 1013 | "futures-core", | ||
| 1014 | "futures-util", | ||
| 1015 | "http 1.3.1", | ||
| 1016 | "http-body", | ||
| 1017 | "hyper", | ||
| 1018 | "ipnet", | ||
| 1019 | "libc", | ||
| 1020 | "percent-encoding", | ||
| 1021 | "pin-project-lite", | ||
| 1022 | "socket2 0.6.0", | ||
| 1023 | "tokio", | ||
| 1024 | "tower-service", | ||
| 1025 | "tracing", | ||
| 1026 | ] | ||
| 1027 | |||
| 1028 | [[package]] | ||
| 1029 | name = "icu_collections" | 932 | name = "icu_collections" |
| 1030 | version = "2.0.0" | 933 | version = "2.0.0" |
| 1031 | source = "registry+https://github.com/rust-lang/crates.io-index" | 934 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| @@ -1183,28 +1086,12 @@ version = "0.7.9" | |||
| 1183 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1086 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 1184 | checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4" | 1087 | checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4" |
| 1185 | dependencies = [ | 1088 | dependencies = [ |
| 1186 | "bitflags 2.9.1", | 1089 | "bitflags", |
| 1187 | "cfg-if", | 1090 | "cfg-if", |
| 1188 | "libc", | 1091 | "libc", |
| 1189 | ] | 1092 | ] |
| 1190 | 1093 | ||
| 1191 | [[package]] | 1094 | [[package]] |
| 1192 | name = "ipnet" | ||
| 1193 | version = "2.11.0" | ||
| 1194 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 1195 | checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" | ||
| 1196 | |||
| 1197 | [[package]] | ||
| 1198 | name = "iri-string" | ||
| 1199 | version = "0.7.8" | ||
| 1200 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 1201 | checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2" | ||
| 1202 | dependencies = [ | ||
| 1203 | "memchr", | ||
| 1204 | "serde", | ||
| 1205 | ] | ||
| 1206 | |||
| 1207 | [[package]] | ||
| 1208 | name = "is_terminal_polyfill" | 1095 | name = "is_terminal_polyfill" |
| 1209 | version = "1.70.1" | 1096 | version = "1.70.1" |
| 1210 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1097 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| @@ -1262,7 +1149,7 @@ version = "0.1.8" | |||
| 1262 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1149 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 1263 | checksum = "360e552c93fa0e8152ab463bc4c4837fce76a225df11dfaeea66c313de5e61f7" | 1150 | checksum = "360e552c93fa0e8152ab463bc4c4837fce76a225df11dfaeea66c313de5e61f7" |
| 1264 | dependencies = [ | 1151 | dependencies = [ |
| 1265 | "bitflags 2.9.1", | 1152 | "bitflags", |
| 1266 | "libc", | 1153 | "libc", |
| 1267 | ] | 1154 | ] |
| 1268 | 1155 | ||
| @@ -1333,15 +1220,9 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" | |||
| 1333 | 1220 | ||
| 1334 | [[package]] | 1221 | [[package]] |
| 1335 | name = "lru" | 1222 | name = "lru" |
| 1336 | version = "0.14.0" | 1223 | version = "0.16.0" |
| 1337 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 1338 | checksum = "9f8cc7106155f10bdf99a6f379688f543ad6596a415375b36a59a054ceda1198" | ||
| 1339 | |||
| 1340 | [[package]] | ||
| 1341 | name = "lru-slab" | ||
| 1342 | version = "0.1.2" | ||
| 1343 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1224 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 1344 | checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" | 1225 | checksum = "86ea4e65087ff52f3862caff188d489f1fab49a0cb09e01b2e3f1a617b10aaed" |
| 1345 | 1226 | ||
| 1346 | [[package]] | 1227 | [[package]] |
| 1347 | name = "memchr" | 1228 | name = "memchr" |
| @@ -1453,16 +1334,16 @@ version = "0.27.1" | |||
| 1453 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1334 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 1454 | checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" | 1335 | checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" |
| 1455 | dependencies = [ | 1336 | dependencies = [ |
| 1456 | "bitflags 2.9.1", | 1337 | "bitflags", |
| 1457 | "cfg-if", | 1338 | "cfg-if", |
| 1458 | "libc", | 1339 | "libc", |
| 1459 | ] | 1340 | ] |
| 1460 | 1341 | ||
| 1461 | [[package]] | 1342 | [[package]] |
| 1462 | name = "nostr" | 1343 | name = "nostr" |
| 1463 | version = "0.42.2" | 1344 | version = "0.43.0" |
| 1464 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1345 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 1465 | checksum = "d193102a62a22b61f9a61b9df54fb19ebab8c1763d088fbb9a6f0f57000fba2d" | 1346 | checksum = "f30e6dcb36d88017587b0b5578d1ed3398afe8e4f45fdb910e48b8675aaf6f68" |
| 1466 | dependencies = [ | 1347 | dependencies = [ |
| 1467 | "aes", | 1348 | "aes", |
| 1468 | "base64", | 1349 | "base64", |
| @@ -1474,8 +1355,6 @@ dependencies = [ | |||
| 1474 | "chacha20poly1305", | 1355 | "chacha20poly1305", |
| 1475 | "getrandom 0.2.16", | 1356 | "getrandom 0.2.16", |
| 1476 | "instant", | 1357 | "instant", |
| 1477 | "regex", | ||
| 1478 | "reqwest", | ||
| 1479 | "scrypt", | 1358 | "scrypt", |
| 1480 | "secp256k1", | 1359 | "secp256k1", |
| 1481 | "serde", | 1360 | "serde", |
| @@ -1486,9 +1365,9 @@ dependencies = [ | |||
| 1486 | 1365 | ||
| 1487 | [[package]] | 1366 | [[package]] |
| 1488 | name = "nostr-connect" | 1367 | name = "nostr-connect" |
| 1489 | version = "0.42.0" | 1368 | version = "0.43.0" |
| 1490 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1369 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 1491 | checksum = "29bcce69dcfe07f399cba2f304b2b0662764eaf35b8e227049c063b1d2ec37d0" | 1370 | checksum = "a3bcd44ea344d1cab3447615681cd3bb90134cafe4d157d3e714c23c31268cd8" |
| 1492 | dependencies = [ | 1371 | dependencies = [ |
| 1493 | "async-utility", | 1372 | "async-utility", |
| 1494 | "nostr", | 1373 | "nostr", |
| @@ -1499,9 +1378,9 @@ dependencies = [ | |||
| 1499 | 1378 | ||
| 1500 | [[package]] | 1379 | [[package]] |
| 1501 | name = "nostr-database" | 1380 | name = "nostr-database" |
| 1502 | version = "0.42.0" | 1381 | version = "0.43.0" |
| 1503 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1382 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 1504 | checksum = "b6aafe85dc7c039c399796043b76009fa744c3a45ac073a023932f7b7d91b1e7" | 1383 | checksum = "b1c75a8c2175d2785ba73cfddef21d1e30da5fbbdf158569b6808ba44973a15b" |
| 1505 | dependencies = [ | 1384 | dependencies = [ |
| 1506 | "flatbuffers", | 1385 | "flatbuffers", |
| 1507 | "lru", | 1386 | "lru", |
| @@ -1511,9 +1390,9 @@ dependencies = [ | |||
| 1511 | 1390 | ||
| 1512 | [[package]] | 1391 | [[package]] |
| 1513 | name = "nostr-lmdb" | 1392 | name = "nostr-lmdb" |
| 1514 | version = "0.42.0" | 1393 | version = "0.43.0" |
| 1515 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1394 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 1516 | checksum = "ed36ce93b11d1dea86b50f26a5bcd7317f237915eeed3948cf52c036ba52872a" | 1395 | checksum = "03e20688047b2114906ba84cce26c955e6cd079c10fc7328bc2618dc8031fb17" |
| 1517 | dependencies = [ | 1396 | dependencies = [ |
| 1518 | "async-utility", | 1397 | "async-utility", |
| 1519 | "heed", | 1398 | "heed", |
| @@ -1525,9 +1404,9 @@ dependencies = [ | |||
| 1525 | 1404 | ||
| 1526 | [[package]] | 1405 | [[package]] |
| 1527 | name = "nostr-relay-pool" | 1406 | name = "nostr-relay-pool" |
| 1528 | version = "0.42.0" | 1407 | version = "0.43.0" |
| 1529 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1408 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 1530 | checksum = "df4d5628d2444349570fb185b0c2d92cfdb7e68d62b13bf3e8a4348b5de7430b" | 1409 | checksum = "265d9b44771ed15db93b183a0c93dbb703b2b0d0b74dffb5c2a081be52373a5a" |
| 1531 | dependencies = [ | 1410 | dependencies = [ |
| 1532 | "async-utility", | 1411 | "async-utility", |
| 1533 | "async-wsocket", | 1412 | "async-wsocket", |
| @@ -1542,16 +1421,15 @@ dependencies = [ | |||
| 1542 | 1421 | ||
| 1543 | [[package]] | 1422 | [[package]] |
| 1544 | name = "nostr-sdk" | 1423 | name = "nostr-sdk" |
| 1545 | version = "0.42.0" | 1424 | version = "0.43.0" |
| 1546 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1425 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 1547 | checksum = "a1e928ba9ac2695fbe10b8aefda59f2abfeb23c10a0e86a0b3e0f6a27bb274a2" | 1426 | checksum = "599f8963d6a1522a13b1a2b0ea6e168acfc367706606f1d33fa595e91fa22db0" |
| 1548 | dependencies = [ | 1427 | dependencies = [ |
| 1549 | "async-utility", | 1428 | "async-utility", |
| 1550 | "nostr", | 1429 | "nostr", |
| 1551 | "nostr-database", | 1430 | "nostr-database", |
| 1552 | "nostr-relay-pool", | 1431 | "nostr-relay-pool", |
| 1553 | "tokio", | 1432 | "tokio", |
| 1554 | "tracing", | ||
| 1555 | ] | 1433 | ] |
| 1556 | 1434 | ||
| 1557 | [[package]] | 1435 | [[package]] |
| @@ -1848,61 +1726,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
| 1848 | checksum = "d68782463e408eb1e668cf6152704bd856c78c5b6417adaee3203d8f4c1fc9ec" | 1726 | checksum = "d68782463e408eb1e668cf6152704bd856c78c5b6417adaee3203d8f4c1fc9ec" |
| 1849 | 1727 | ||
| 1850 | [[package]] | 1728 | [[package]] |
| 1851 | name = "quinn" | ||
| 1852 | version = "0.11.8" | ||
| 1853 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 1854 | checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8" | ||
| 1855 | dependencies = [ | ||
| 1856 | "bytes", | ||
| 1857 | "cfg_aliases", | ||
| 1858 | "pin-project-lite", | ||
| 1859 | "quinn-proto", | ||
| 1860 | "quinn-udp", | ||
| 1861 | "rustc-hash", | ||
| 1862 | "rustls", | ||
| 1863 | "socket2 0.5.10", | ||
| 1864 | "thiserror 2.0.12", | ||
| 1865 | "tokio", | ||
| 1866 | "tracing", | ||
| 1867 | "web-time", | ||
| 1868 | ] | ||
| 1869 | |||
| 1870 | [[package]] | ||
| 1871 | name = "quinn-proto" | ||
| 1872 | version = "0.11.12" | ||
| 1873 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 1874 | checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e" | ||
| 1875 | dependencies = [ | ||
| 1876 | "bytes", | ||
| 1877 | "getrandom 0.3.3", | ||
| 1878 | "lru-slab", | ||
| 1879 | "rand 0.9.2", | ||
| 1880 | "ring", | ||
| 1881 | "rustc-hash", | ||
| 1882 | "rustls", | ||
| 1883 | "rustls-pki-types", | ||
| 1884 | "slab", | ||
| 1885 | "thiserror 2.0.12", | ||
| 1886 | "tinyvec", | ||
| 1887 | "tracing", | ||
| 1888 | "web-time", | ||
| 1889 | ] | ||
| 1890 | |||
| 1891 | [[package]] | ||
| 1892 | name = "quinn-udp" | ||
| 1893 | version = "0.5.13" | ||
| 1894 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 1895 | checksum = "fcebb1209ee276352ef14ff8732e24cc2b02bbac986cd74a4c81bcb2f9881970" | ||
| 1896 | dependencies = [ | ||
| 1897 | "cfg_aliases", | ||
| 1898 | "libc", | ||
| 1899 | "once_cell", | ||
| 1900 | "socket2 0.5.10", | ||
| 1901 | "tracing", | ||
| 1902 | "windows-sys 0.59.0", | ||
| 1903 | ] | ||
| 1904 | |||
| 1905 | [[package]] | ||
| 1906 | name = "quote" | 1729 | name = "quote" |
| 1907 | version = "1.0.40" | 1730 | version = "1.0.40" |
| 1908 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1731 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| @@ -2013,7 +1836,7 @@ version = "0.5.17" | |||
| 2013 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1836 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 2014 | checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77" | 1837 | checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77" |
| 2015 | dependencies = [ | 1838 | dependencies = [ |
| 2016 | "bitflags 2.9.1", | 1839 | "bitflags", |
| 2017 | ] | 1840 | ] |
| 2018 | 1841 | ||
| 2019 | [[package]] | 1842 | [[package]] |
| @@ -2057,44 +1880,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
| 2057 | checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" | 1880 | checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" |
| 2058 | 1881 | ||
| 2059 | [[package]] | 1882 | [[package]] |
| 2060 | name = "reqwest" | ||
| 2061 | version = "0.12.22" | ||
| 2062 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 2063 | checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531" | ||
| 2064 | dependencies = [ | ||
| 2065 | "base64", | ||
| 2066 | "bytes", | ||
| 2067 | "futures-core", | ||
| 2068 | "http 1.3.1", | ||
| 2069 | "http-body", | ||
| 2070 | "http-body-util", | ||
| 2071 | "hyper", | ||
| 2072 | "hyper-rustls", | ||
| 2073 | "hyper-util", | ||
| 2074 | "js-sys", | ||
| 2075 | "log", | ||
| 2076 | "percent-encoding", | ||
| 2077 | "pin-project-lite", | ||
| 2078 | "quinn", | ||
| 2079 | "rustls", | ||
| 2080 | "rustls-pki-types", | ||
| 2081 | "serde", | ||
| 2082 | "serde_json", | ||
| 2083 | "serde_urlencoded", | ||
| 2084 | "sync_wrapper", | ||
| 2085 | "tokio", | ||
| 2086 | "tokio-rustls", | ||
| 2087 | "tower", | ||
| 2088 | "tower-http", | ||
| 2089 | "tower-service", | ||
| 2090 | "url", | ||
| 2091 | "wasm-bindgen", | ||
| 2092 | "wasm-bindgen-futures", | ||
| 2093 | "web-sys", | ||
| 2094 | "webpki-roots 1.0.2", | ||
| 2095 | ] | ||
| 2096 | |||
| 2097 | [[package]] | ||
| 2098 | name = "rexpect" | 1883 | name = "rexpect" |
| 2099 | version = "0.5.0" | 1884 | version = "0.5.0" |
| 2100 | source = "git+https://github.com/rust-cli/rexpect.git?rev=9eb61dd#9eb61dd444f25307639367ac7e1a49d5a1915d55" | 1885 | source = "git+https://github.com/rust-cli/rexpect.git?rev=9eb61dd#9eb61dd444f25307639367ac7e1a49d5a1915d55" |
| @@ -2127,12 +1912,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
| 2127 | checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" | 1912 | checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" |
| 2128 | 1913 | ||
| 2129 | [[package]] | 1914 | [[package]] |
| 2130 | name = "rustc-hash" | ||
| 2131 | version = "2.1.1" | ||
| 2132 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 2133 | checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" | ||
| 2134 | |||
| 2135 | [[package]] | ||
| 2136 | name = "rustc_version" | 1915 | name = "rustc_version" |
| 2137 | version = "0.4.1" | 1916 | version = "0.4.1" |
| 2138 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1917 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| @@ -2147,7 +1926,7 @@ version = "1.0.8" | |||
| 2147 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1926 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 2148 | checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8" | 1927 | checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8" |
| 2149 | dependencies = [ | 1928 | dependencies = [ |
| 2150 | "bitflags 2.9.1", | 1929 | "bitflags", |
| 2151 | "errno", | 1930 | "errno", |
| 2152 | "libc", | 1931 | "libc", |
| 2153 | "linux-raw-sys", | 1932 | "linux-raw-sys", |
| @@ -2174,7 +1953,6 @@ version = "1.12.0" | |||
| 2174 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1953 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 2175 | checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" | 1954 | checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" |
| 2176 | dependencies = [ | 1955 | dependencies = [ |
| 2177 | "web-time", | ||
| 2178 | "zeroize", | 1956 | "zeroize", |
| 2179 | ] | 1957 | ] |
| 2180 | 1958 | ||
| @@ -2302,18 +2080,6 @@ dependencies = [ | |||
| 2302 | ] | 2080 | ] |
| 2303 | 2081 | ||
| 2304 | [[package]] | 2082 | [[package]] |
| 2305 | name = "serde_urlencoded" | ||
| 2306 | version = "0.7.1" | ||
| 2307 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 2308 | checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" | ||
| 2309 | dependencies = [ | ||
| 2310 | "form_urlencoded", | ||
| 2311 | "itoa", | ||
| 2312 | "ryu", | ||
| 2313 | "serde", | ||
| 2314 | ] | ||
| 2315 | |||
| 2316 | [[package]] | ||
| 2317 | name = "serde_yaml" | 2083 | name = "serde_yaml" |
| 2318 | version = "0.9.34+deprecated" | 2084 | version = "0.9.34+deprecated" |
| 2319 | source = "registry+https://github.com/rust-lang/crates.io-index" | 2085 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| @@ -2425,16 +2191,6 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" | |||
| 2425 | 2191 | ||
| 2426 | [[package]] | 2192 | [[package]] |
| 2427 | name = "socket2" | 2193 | name = "socket2" |
| 2428 | version = "0.5.10" | ||
| 2429 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 2430 | checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" | ||
| 2431 | dependencies = [ | ||
| 2432 | "libc", | ||
| 2433 | "windows-sys 0.52.0", | ||
| 2434 | ] | ||
| 2435 | |||
| 2436 | [[package]] | ||
| 2437 | name = "socket2" | ||
| 2438 | version = "0.6.0" | 2194 | version = "0.6.0" |
| 2439 | source = "registry+https://github.com/rust-lang/crates.io-index" | 2195 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 2440 | checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807" | 2196 | checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807" |
| @@ -2491,15 +2247,6 @@ dependencies = [ | |||
| 2491 | ] | 2247 | ] |
| 2492 | 2248 | ||
| 2493 | [[package]] | 2249 | [[package]] |
| 2494 | name = "sync_wrapper" | ||
| 2495 | version = "1.0.2" | ||
| 2496 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 2497 | checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" | ||
| 2498 | dependencies = [ | ||
| 2499 | "futures-core", | ||
| 2500 | ] | ||
| 2501 | |||
| 2502 | [[package]] | ||
| 2503 | name = "synchronoise" | 2250 | name = "synchronoise" |
| 2504 | version = "1.0.1" | 2251 | version = "1.0.1" |
| 2505 | source = "registry+https://github.com/rust-lang/crates.io-index" | 2252 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| @@ -2652,7 +2399,7 @@ dependencies = [ | |||
| 2652 | "pin-project-lite", | 2399 | "pin-project-lite", |
| 2653 | "signal-hook-registry", | 2400 | "signal-hook-registry", |
| 2654 | "slab", | 2401 | "slab", |
| 2655 | "socket2 0.6.0", | 2402 | "socket2", |
| 2656 | "tokio-macros", | 2403 | "tokio-macros", |
| 2657 | "windows-sys 0.59.0", | 2404 | "windows-sys 0.59.0", |
| 2658 | ] | 2405 | ] |
| @@ -2719,86 +2466,20 @@ dependencies = [ | |||
| 2719 | ] | 2466 | ] |
| 2720 | 2467 | ||
| 2721 | [[package]] | 2468 | [[package]] |
| 2722 | name = "tower" | ||
| 2723 | version = "0.5.2" | ||
| 2724 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 2725 | checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" | ||
| 2726 | dependencies = [ | ||
| 2727 | "futures-core", | ||
| 2728 | "futures-util", | ||
| 2729 | "pin-project-lite", | ||
| 2730 | "sync_wrapper", | ||
| 2731 | "tokio", | ||
| 2732 | "tower-layer", | ||
| 2733 | "tower-service", | ||
| 2734 | ] | ||
| 2735 | |||
| 2736 | [[package]] | ||
| 2737 | name = "tower-http" | ||
| 2738 | version = "0.6.6" | ||
| 2739 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 2740 | checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" | ||
| 2741 | dependencies = [ | ||
| 2742 | "bitflags 2.9.1", | ||
| 2743 | "bytes", | ||
| 2744 | "futures-util", | ||
| 2745 | "http 1.3.1", | ||
| 2746 | "http-body", | ||
| 2747 | "iri-string", | ||
| 2748 | "pin-project-lite", | ||
| 2749 | "tower", | ||
| 2750 | "tower-layer", | ||
| 2751 | "tower-service", | ||
| 2752 | ] | ||
| 2753 | |||
| 2754 | [[package]] | ||
| 2755 | name = "tower-layer" | ||
| 2756 | version = "0.3.3" | ||
| 2757 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 2758 | checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" | ||
| 2759 | |||
| 2760 | [[package]] | ||
| 2761 | name = "tower-service" | ||
| 2762 | version = "0.3.3" | ||
| 2763 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 2764 | checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" | ||
| 2765 | |||
| 2766 | [[package]] | ||
| 2767 | name = "tracing" | 2469 | name = "tracing" |
| 2768 | version = "0.1.41" | 2470 | version = "0.1.41" |
| 2769 | source = "registry+https://github.com/rust-lang/crates.io-index" | 2471 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 2770 | checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" | 2472 | checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" |
| 2771 | dependencies = [ | 2473 | dependencies = [ |
| 2772 | "pin-project-lite", | 2474 | "pin-project-lite", |
| 2773 | "tracing-attributes", | ||
| 2774 | "tracing-core", | 2475 | "tracing-core", |
| 2775 | ] | 2476 | ] |
| 2776 | 2477 | ||
| 2777 | [[package]] | 2478 | [[package]] |
| 2778 | name = "tracing-attributes" | ||
| 2779 | version = "0.1.30" | ||
| 2780 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 2781 | checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" | ||
| 2782 | dependencies = [ | ||
| 2783 | "proc-macro2", | ||
| 2784 | "quote", | ||
| 2785 | "syn", | ||
| 2786 | ] | ||
| 2787 | |||
| 2788 | [[package]] | ||
| 2789 | name = "tracing-core" | 2479 | name = "tracing-core" |
| 2790 | version = "0.1.34" | 2480 | version = "0.1.34" |
| 2791 | source = "registry+https://github.com/rust-lang/crates.io-index" | 2481 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 2792 | checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" | 2482 | checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" |
| 2793 | dependencies = [ | ||
| 2794 | "once_cell", | ||
| 2795 | ] | ||
| 2796 | |||
| 2797 | [[package]] | ||
| 2798 | name = "try-lock" | ||
| 2799 | version = "0.2.5" | ||
| 2800 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 2801 | checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" | ||
| 2802 | 2483 | ||
| 2803 | [[package]] | 2484 | [[package]] |
| 2804 | name = "tungstenite" | 2485 | name = "tungstenite" |
| @@ -2977,15 +2658,6 @@ dependencies = [ | |||
| 2977 | ] | 2658 | ] |
| 2978 | 2659 | ||
| 2979 | [[package]] | 2660 | [[package]] |
| 2980 | name = "want" | ||
| 2981 | version = "0.3.1" | ||
| 2982 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 2983 | checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" | ||
| 2984 | dependencies = [ | ||
| 2985 | "try-lock", | ||
| 2986 | ] | ||
| 2987 | |||
| 2988 | [[package]] | ||
| 2989 | name = "wasi" | 2661 | name = "wasi" |
| 2990 | version = "0.11.1+wasi-snapshot-preview1" | 2662 | version = "0.11.1+wasi-snapshot-preview1" |
| 2991 | source = "registry+https://github.com/rust-lang/crates.io-index" | 2663 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| @@ -3299,7 +2971,7 @@ version = "0.39.0" | |||
| 3299 | source = "registry+https://github.com/rust-lang/crates.io-index" | 2971 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 3300 | checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" | 2972 | checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" |
| 3301 | dependencies = [ | 2973 | dependencies = [ |
| 3302 | "bitflags 2.9.1", | 2974 | "bitflags", |
| 3303 | ] | 2975 | ] |
| 3304 | 2976 | ||
| 3305 | [[package]] | 2977 | [[package]] |
| @@ -23,12 +23,12 @@ directories = "6.0.0" | |||
| 23 | futures = "0.3.31" | 23 | futures = "0.3.31" |
| 24 | git2 = "0.20.2" | 24 | git2 = "0.20.2" |
| 25 | indicatif = "0.18.0" | 25 | indicatif = "0.18.0" |
| 26 | nostr = { version = "0.42.2", features = ["nip05", "nip49"] } | 26 | nostr = { version = "0.43.0", features = ["nip49"] } |
| 27 | nostr-connect = "0.42.0" | 27 | nostr-connect = "0.43.0" |
| 28 | nostr-database = "0.42.0" | 28 | nostr-database = "0.43.0" |
| 29 | nostr-lmdb = "0.42.0" | 29 | nostr-lmdb = "0.43.0" |
| 30 | nostr-relay-pool = "0.42.0" | 30 | nostr-relay-pool = "0.43.0" |
| 31 | nostr-sdk = "0.42.0" | 31 | nostr-sdk = "0.43.0" |
| 32 | passwords = "3.1.16" | 32 | passwords = "3.1.16" |
| 33 | qrcode = { version = "0.14.1", default-features = false } | 33 | qrcode = { version = "0.14.1", default-features = false } |
| 34 | scrypt = "0.11.0" | 34 | scrypt = "0.11.0" |
diff --git a/src/lib/client.rs b/src/lib/client.rs index 6f28cff..c1e7e69 100644 --- a/src/lib/client.rs +++ b/src/lib/client.rs | |||
| @@ -32,15 +32,15 @@ use mockall::*; | |||
| 32 | use nostr::{ | 32 | use nostr::{ |
| 33 | Event, | 33 | Event, |
| 34 | event::{TagKind, TagStandard, UnsignedEvent}, | 34 | event::{TagKind, TagStandard, UnsignedEvent}, |
| 35 | filter::Alphabet, | 35 | filter::{Alphabet, MatchEventOptions}, |
| 36 | nips::{nip01::Coordinate, nip19::Nip19Coordinate}, | 36 | nips::{nip01::Coordinate, nip19::Nip19Coordinate}, |
| 37 | signer::SignerBackend, | 37 | signer::SignerBackend, |
| 38 | }; | 38 | }; |
| 39 | use nostr_database::{NostrEventsDatabase, SaveEventStatus}; | 39 | use nostr_database::{NostrDatabase, SaveEventStatus}; |
| 40 | use nostr_lmdb::NostrLMDB; | 40 | use nostr_lmdb::NostrLMDB; |
| 41 | use nostr_relay_pool::relay::ReqExitPolicy; | 41 | use nostr_relay_pool::relay::ReqExitPolicy; |
| 42 | use nostr_sdk::{ | 42 | use nostr_sdk::{ |
| 43 | EventBuilder, EventId, Kind, NostrSigner, Options, PublicKey, RelayUrl, SingleLetterTag, | 43 | ClientOptions, EventBuilder, EventId, Kind, NostrSigner, PublicKey, RelayUrl, SingleLetterTag, |
| 44 | Timestamp, Url, prelude::RelayLimits, | 44 | Timestamp, Url, prelude::RelayLimits, |
| 45 | }; | 45 | }; |
| 46 | 46 | ||
| @@ -144,12 +144,12 @@ impl Connect for Client { | |||
| 144 | Client { | 144 | Client { |
| 145 | client: if let Some(keys) = opts.keys { | 145 | client: if let Some(keys) = opts.keys { |
| 146 | nostr_sdk::ClientBuilder::new() | 146 | nostr_sdk::ClientBuilder::new() |
| 147 | .opts(Options::new().relay_limits(RelayLimits::disable())) | 147 | .opts(ClientOptions::new().relay_limits(RelayLimits::disable())) |
| 148 | .signer(keys) | 148 | .signer(keys) |
| 149 | .build() | 149 | .build() |
| 150 | } else { | 150 | } else { |
| 151 | nostr_sdk::ClientBuilder::new() | 151 | nostr_sdk::ClientBuilder::new() |
| 152 | .opts(Options::new().relay_limits(RelayLimits::disable())) | 152 | .opts(ClientOptions::new().relay_limits(RelayLimits::disable())) |
| 153 | .build() | 153 | .build() |
| 154 | }, | 154 | }, |
| 155 | relay_default_set: opts.relay_default_set, | 155 | relay_default_set: opts.relay_default_set, |
| @@ -605,7 +605,11 @@ impl Connect for Client { | |||
| 605 | .await? | 605 | .await? |
| 606 | .iter() | 606 | .iter() |
| 607 | // don't process events that don't match filters | 607 | // don't process events that don't match filters |
| 608 | .filter(|e| filters.iter().any(|f| f.match_event(e))) | 608 | .filter(|e| { |
| 609 | filters | ||
| 610 | .iter() | ||
| 611 | .any(|f| f.match_event(e, MatchEventOptions::default())) | ||
| 612 | }) | ||
| 609 | .cloned() | 613 | .cloned() |
| 610 | .collect(); | 614 | .collect(); |
| 611 | // TODO: try reconcile | 615 | // TODO: try reconcile |
diff --git a/src/lib/git/nostr_url.rs b/src/lib/git/nostr_url.rs index e9b482f..8abf3f7 100644 --- a/src/lib/git/nostr_url.rs +++ b/src/lib/git/nostr_url.rs | |||
| @@ -206,6 +206,7 @@ impl NostrUrlDecoded { | |||
| 206 | if s.len() == 2 { s[1] } else { s[0] } | 206 | if s.len() == 2 { s[1] } else { s[0] } |
| 207 | }; | 207 | }; |
| 208 | term.write_line(&format!("fetching pubic key info from {domain}..."))?; | 208 | term.write_line(&format!("fetching pubic key info from {domain}..."))?; |
| 209 | // TODO we now need to implement our own wrapper for this | ||
| 209 | let res = nip05::profile(npub_or_nip05, None).await.context(format!( | 210 | let res = nip05::profile(npub_or_nip05, None).await.context(format!( |
| 210 | "failed to get nostr public key for {npub_or_nip05} from {domain}" | 211 | "failed to get nostr public key for {npub_or_nip05} from {domain}" |
| 211 | ))?; | 212 | ))?; |
diff --git a/src/lib/login/fresh.rs b/src/lib/login/fresh.rs index 358045a..aec8df5 100644 --- a/src/lib/login/fresh.rs +++ b/src/lib/login/fresh.rs | |||
| @@ -384,6 +384,7 @@ pub fn generate_nostr_connect_app( | |||
| 384 | pub async fn fetch_nip46_uri_from_nip05(nip05: &str) -> Result<NostrConnectURI> { | 384 | pub async fn fetch_nip46_uri_from_nip05(nip05: &str) -> Result<NostrConnectURI> { |
| 385 | let term = console::Term::stderr(); | 385 | let term = console::Term::stderr(); |
| 386 | term.write_line("contacting login service provider...")?; | 386 | term.write_line("contacting login service provider...")?; |
| 387 | // TODO we now need to implement our own wrapper for this | ||
| 387 | let res = nip05::profile(&nip05, None).await; | 388 | let res = nip05::profile(&nip05, None).await; |
| 388 | term.clear_last_lines(1)?; | 389 | term.clear_last_lines(1)?; |
| 389 | match res { | 390 | match res { |
diff --git a/test_utils/Cargo.toml b/test_utils/Cargo.toml index 8602416..236ba80 100644 --- a/test_utils/Cargo.toml +++ b/test_utils/Cargo.toml | |||
| @@ -10,10 +10,10 @@ dialoguer = "0.11.0" | |||
| 10 | directories = "6.0.0" | 10 | directories = "6.0.0" |
| 11 | futures = "0.3.31" | 11 | futures = "0.3.31" |
| 12 | git2 = "0.20.2" | 12 | git2 = "0.20.2" |
| 13 | nostr = "0.42.2" | 13 | nostr = "0.43.0" |
| 14 | nostr-database = "0.42.0" | 14 | nostr-database = "0.43.0" |
| 15 | nostr-lmdb = "0.42.0" | 15 | nostr-lmdb = "0.43.0" |
| 16 | nostr-sdk = "0.42.0" | 16 | nostr-sdk = "0.43.0" |
| 17 | once_cell = "1.21.3" | 17 | once_cell = "1.21.3" |
| 18 | rand = "0.9" | 18 | rand = "0.9" |
| 19 | rexpect = { git = "https://github.com/rust-cli/rexpect.git", rev = "9eb61dd" } | 19 | rexpect = { git = "https://github.com/rust-cli/rexpect.git", rev = "9eb61dd" } |
diff --git a/test_utils/src/lib.rs b/test_utils/src/lib.rs index 7d79cff..3ae004f 100644 --- a/test_utils/src/lib.rs +++ b/test_utils/src/lib.rs | |||
| @@ -13,7 +13,7 @@ use futures::{executor::block_on, future::join_all}; | |||
| 13 | use git::GitTestRepo; | 13 | use git::GitTestRepo; |
| 14 | use git2::{Signature, Time}; | 14 | use git2::{Signature, Time}; |
| 15 | use nostr::{self, Kind, Tag, nips::nip65::RelayMetadata}; | 15 | use nostr::{self, Kind, Tag, nips::nip65::RelayMetadata}; |
| 16 | use nostr_database::NostrEventsDatabase; | 16 | use nostr_database::NostrDatabase; |
| 17 | use nostr_lmdb::NostrLMDB; | 17 | use nostr_lmdb::NostrLMDB; |
| 18 | use nostr_sdk::{Client, Event, NostrSigner, TagStandard, serde_json}; | 18 | use nostr_sdk::{Client, Event, NostrSigner, TagStandard, serde_json}; |
| 19 | use once_cell::sync::Lazy; | 19 | use once_cell::sync::Lazy; |
diff --git a/test_utils/src/relay.rs b/test_utils/src/relay.rs index b14f532..8a982a4 100644 --- a/test_utils/src/relay.rs +++ b/test_utils/src/relay.rs | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | use std::collections::HashMap; | 1 | use std::collections::HashMap; |
| 2 | 2 | ||
| 3 | use anyhow::{Result, bail}; | 3 | use anyhow::{Result, bail}; |
| 4 | use nostr::{ClientMessage, JsonUtil, RelayMessage}; | 4 | use nostr::{ClientMessage, JsonUtil, RelayMessage, filter::MatchEventOptions}; |
| 5 | 5 | ||
| 6 | use crate::CliTester; | 6 | use crate::CliTester; |
| 7 | 7 | ||
| @@ -105,7 +105,11 @@ impl<'a> Relay<'a> { | |||
| 105 | &self | 105 | &self |
| 106 | .events | 106 | .events |
| 107 | .iter() | 107 | .iter() |
| 108 | .filter(|e| filters.iter().any(|filter| filter.match_event(e))) | 108 | .filter(|e| { |
| 109 | filters | ||
| 110 | .iter() | ||
| 111 | .any(|filter| filter.match_event(e, MatchEventOptions::default())) | ||
| 112 | }) | ||
| 109 | .filter(|_| true) | 113 | .filter(|_| true) |
| 110 | .cloned() | 114 | .cloned() |
| 111 | .collect(), | 115 | .collect(), |