chore(cargo): update derive_more from 1.0.0-beta.6 to 1.0.0-beta.7

Revert "chore(cargo): update rusqlite"
This reverts commit 1b92d18777.
2026-07-11 13:33:09 +03:00 · 2024-08-03 21:21:56 +00:00 · 2024-08-03 19:19:55 +00:00 · 2024-08-03 19:08:47 +00:00 · 2024-08-03 19:08:29 +00:00 · 2024-08-02 23:06:30 +00:00
21 changed files with 699 additions and 255 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,35 @@
 # Changelog

+## [1.142.2] - 2024-08-02
+
+### Features / Changes
+
+- Try only the full email address if username is unspecified.
+- Sort DNS results by successful connection timestamp ([#5818](https://github.com/deltachat/deltachat-core-rust/pull/5818)).
+
+### Fixes
+
+- Await the tasks after aborting them.
+- Do not reset is_chatmail config on failed reconfiguration.
+- Fix compilation on iOS.
+- Reset configured_provider on reconfiguration.
+
+### Refactor
+
+- Don't update message state to `OutMdnRcvd` anymore.
+
+### Build system
+
+- Use workspace dependencies to make cargo-deny 0.15.1 happy.
+- cargo: Update bytemuck from 0.14.3 to 0.16.3.
+- cargo: Bump toml from 0.8.14 to 0.8.15.
+- cargo: Bump serde_json from 1.0.120 to 1.0.122.
+- cargo: Bump human-panic from 2.0.0 to 2.0.1.
+- cargo: Bump thiserror from 1.0.61 to 1.0.63.
+- cargo: Bump syn from 2.0.68 to 2.0.72.
+- cargo: Bump quoted_printable from 0.5.0 to 0.5.1.
+- cargo: Bump serde from 1.0.203 to 1.0.204.
+
 ## [1.142.1] - 2024-07-30

 ### Features / Changes
@@ -4631,3 +4661,4 @@ https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed
 [1.141.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.141.1...v1.141.2
 [1.142.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.141.2...v1.142.0
 [1.142.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.0...v1.142.1
+[1.142.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.142.1...v1.142.2
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -271,7 +271,7 @@ checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 "synstructure 0.13.1",
 ]

@@ -294,7 +294,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -413,7 +413,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -950,7 +950,7 @@ dependencies = [
 "heck",
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -1287,7 +1287,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -1335,7 +1335,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "strsim 0.11.1",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -1357,7 +1357,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
 dependencies = [
 "darling_core 0.20.9",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -1407,7 +1407,7 @@ dependencies = [

 [[package]]
 name = "deltachat"
-version = "1.142.1"
+version = "1.142.2"
 dependencies = [
 "ansi_term",
 "anyhow",
@@ -1417,7 +1417,6 @@ dependencies = [
 "async-native-tls",
 "async-smtp",
 "async_zip",
- "backtrace",
 "base64 0.22.1",
 "brotli",
 "chrono",
@@ -1469,7 +1468,6 @@ dependencies = [
 "serde",
 "serde_json",
 "sha-1",
- "sha2 0.10.8",
 "smallvec",
 "strum",
 "strum_macros",
@@ -1501,7 +1499,7 @@ dependencies = [

 [[package]]
 name = "deltachat-jsonrpc"
-version = "1.142.1"
+version = "1.142.2"
 dependencies = [
 "anyhow",
 "async-channel 2.3.1",
@@ -1526,7 +1524,7 @@ dependencies = [

 [[package]]
 name = "deltachat-repl"
-version = "1.142.1"
+version = "1.142.2"
 dependencies = [
 "ansi_term",
 "anyhow",
@@ -1541,7 +1539,7 @@ dependencies = [

 [[package]]
 name = "deltachat-rpc-server"
-version = "1.142.1"
+version = "1.142.2"
 dependencies = [
 "anyhow",
 "deltachat",
@@ -1565,12 +1563,12 @@ name = "deltachat_derive"
 version = "2.0.0"
 dependencies = [
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
 name = "deltachat_ffi"
-version = "1.142.1"
+version = "1.142.2"
 dependencies = [
 "anyhow",
 "deltachat",
@@ -1658,7 +1656,7 @@ checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -1689,7 +1687,7 @@ dependencies = [
 "darling 0.20.9",
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -1699,7 +1697,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b"
 dependencies = [
 "derive_builder_core",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -1717,22 +1715,22 @@ dependencies = [

 [[package]]
 name = "derive_more"
-version = "1.0.0-beta.6"
+version = "1.0.0-beta.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7abbfc297053be59290e3152f8cbcd52c8642e0728b69ee187d991d4c1af08d"
+checksum = "3249c0372e72f5f93b5c0ca54c0ab76bbf6216b6f718925476fd9bc4ffabb4fe"
 dependencies = [
 "derive_more-impl",
 ]

 [[package]]
 name = "derive_more-impl"
-version = "1.0.0-beta.6"
+version = "1.0.0-beta.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e"
+checksum = "27d919ced7590fc17b5d5a3c63b662e8a7d2324212c4e4dbbed975cafd22d16d"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 "unicode-xid",
 ]

@@ -1822,7 +1820,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -2184,7 +2182,7 @@ dependencies = [
 "heck",
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -2197,7 +2195,7 @@ dependencies = [
 "num-traits",
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -2217,7 +2215,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -2232,9 +2230,9 @@ dependencies = [

 [[package]]
 name = "env_logger"
-version = "0.11.3"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9"
+checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
 dependencies = [
 "anstream",
 "anstyle",
@@ -2606,7 +2604,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -3035,9 +3033,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"

 [[package]]
 name = "human-panic"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c5d0e9120f6bca6120d142c7ede1ba376dd6bf276d69dd3dbe6cbeb7824179"
+checksum = "1c5a08ed290eac04006e21e63d32e90086b6182c7cd0452d10f4264def1fec9a"
 dependencies = [
 "backtrace",
 "os_info",
@@ -3400,7 +3398,7 @@ dependencies = [
 "anyhow",
 "crypto_box",
 "data-encoding",
- "derive_more 1.0.0-beta.6",
+ "derive_more 1.0.0-beta.7",
 "ed25519-dalek 2.1.1",
 "getrandom 0.2.12",
 "hex",
@@ -3439,7 +3437,7 @@ checksum = "60a25bef4066809009d90cb5ff885c0d1adf77690805431f45577e624af0b4c6"
 dependencies = [
 "anyhow",
 "bytes",
- "derive_more 1.0.0-beta.6",
+ "derive_more 1.0.0-beta.7",
 "ed25519-dalek 2.1.1",
 "futures-lite 2.3.0",
 "genawaiter",
@@ -3491,7 +3489,7 @@ dependencies = [
 "bytes",
 "clap",
 "der 0.7.8",
- "derive_more 1.0.0-beta.6",
+ "derive_more 1.0.0-beta.7",
 "duct",
 "flume",
 "futures-buffered",
@@ -3885,13 +3883,14 @@ dependencies = [

 [[package]]
 name = "mio"
-version = "0.8.11"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4"
 dependencies = [
+ "hermit-abi",
 "libc",
 "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -4157,7 +4156,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -4218,7 +4217,7 @@ dependencies = [
 "proc-macro-crate",
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -4301,7 +4300,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -4545,7 +4544,7 @@ dependencies = [
 "pest_meta",
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -4640,7 +4639,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -4774,7 +4773,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "regex",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -4991,7 +4990,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -5058,9 +5057,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"

 [[package]]
 name = "quick-xml"
-version = "0.35.0"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86e446ed58cef1bbfe847bc2fda0e2e4ea9f0e57b90c507d4781292590d72a4e"
+checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc"
 dependencies = [
 "memchr",
 ]
@@ -5181,9 +5180,9 @@ dependencies = [

 [[package]]
 name = "quoted_printable"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0"
+checksum = "640c9bd8497b02465aeef5375144c26062e0dcd5939dfcbb0f5db76cb8c17c73"

 [[package]]
 name = "radium"
@@ -5876,7 +5875,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "serde_derive_internals",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -5963,9 +5962,9 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.203"
+version = "1.0.204"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
 dependencies = [
 "serde_derive",
 ]
@@ -5990,13 +5989,13 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.203"
+version = "1.0.204"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -6007,16 +6006,17 @@ checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
 name = "serde_json"
-version = "1.0.120"
+version = "1.0.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
+checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da"
 dependencies = [
 "itoa",
+ "memchr",
 "ryu",
 "serde",
 ]
@@ -6079,7 +6079,7 @@ dependencies = [
 "darling 0.20.9",
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -6411,7 +6411,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "struct_iterable_internal",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -6439,7 +6439,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "rustversion",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -6501,9 +6501,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -6542,7 +6542,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -6652,22 +6652,22 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.61"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.61"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -6749,21 +6749,20 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

 [[package]]
 name = "tokio"
-version = "1.38.0"
+version = "1.39.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1"
 dependencies = [
 "backtrace",
 "bytes",
 "libc",
 "mio",
- "num_cpus",
 "parking_lot",
 "pin-project-lite",
 "signal-hook-registry",
 "socket2",
 "tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -6778,13 +6777,13 @@ dependencies = [

 [[package]]
 name = "tokio-macros"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -6932,14 +6931,14 @@ dependencies = [

 [[package]]
 name = "toml"
-version = "0.8.14"
+version = "0.8.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
+checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28"
 dependencies = [
 "serde",
 "serde_spanned",
 "toml_datetime",
- "toml_edit 0.22.14",
+ "toml_edit 0.22.16",
 ]

 [[package]]
@@ -6964,9 +6963,9 @@ dependencies = [

 [[package]]
 name = "toml_edit"
-version = "0.22.14"
+version = "0.22.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
+checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788"
 dependencies = [
 "indexmap 2.2.5",
 "serde",
@@ -7023,7 +7022,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -7277,9 +7276,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"

 [[package]]
 name = "uuid"
-version = "1.9.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439"
+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
 dependencies = [
 "getrandom 0.2.12",
 "serde",
@@ -7373,7 +7372,7 @@ dependencies = [
 "once_cell",
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 "wasm-bindgen-shared",
 ]

@@ -7407,7 +7406,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
@@ -7570,7 +7569,7 @@ checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -7581,7 +7580,7 @@ checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -7952,7 +7951,7 @@ dependencies = [
 "darling 0.20.9",
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -7978,7 +7977,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
@@ -7998,7 +7997,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.68",
+ "syn 2.0.72",
 ]

 [[package]]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.142.1"
+version = "1.142.2"
 edition = "2021"
 license = "MPL-2.0"
 rust-version = "1.77"
@@ -45,7 +45,6 @@ async-imap = { version = "0.9.7", default-features = false, features = ["runtime
 async-native-tls = { version = "0.5", default-features = false, features = ["runtime-tokio"] }
 async-smtp = { version = "0.9", default-features = false, features = ["runtime-tokio"] }
 async_zip = { version = "0.0.12", default-features = false, features = ["deflate", "fs"] }
-backtrace = "0.3"
 base64 = { workspace = true }
 brotli = { version = "6", default-features=false, features = ["std"] }
 chrono = { workspace = true, features = ["alloc", "clock", "std"] }
@@ -77,7 +76,7 @@ percent-encoding = "2.3"
 parking_lot = "0.12"
 pgp = { version = "0.13", default-features = false }
 qrcodegen = "1.7.0"
-quick-xml = "0.35"
+quick-xml = "0.36"
 quoted_printable = "0.5"
 rand = { workspace = true }
 regex = { workspace = true }
@@ -88,7 +87,6 @@ sanitize-filename = { workspace = true }
 serde_json = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 sha-1 = "0.10"
-sha2 = "0.10"
 smallvec = "1.13.2"
 strum = "0.26"
 strum_macros = "0.26"
@@ -164,8 +162,8 @@ async-channel = "2.3.1"
 base64 = "0.22"
 chrono = { version = "0.4.38", default-features = false }
 deltachat-contact-tools = { path = "deltachat-contact-tools" }
-deltachat-jsonrpc = { path = "deltachat-jsonrpc" }
-deltachat = { path = "." }
+deltachat-jsonrpc = { path = "deltachat-jsonrpc", default-features = false }
+deltachat = { path = ".", default-features = false }
 futures = "0.3.30"
 futures-lite = "2.3.0"
 libc = "0.2"
@@ -180,7 +178,7 @@ serde_json = "1"
 serde = "1.0"
 tempfile = "3.10.1"
 thiserror = "1"
-tokio = "1.38.0"
+tokio = "1.39.2"
 tokio-util = "0.7.11"
 tracing-subscriber = "0.3"
 yerpc = "0.6.2"
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.142.1"
+version = "1.142.2"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
@@ -29,6 +29,6 @@ yerpc = { workspace = true, features = ["anyhow_expose"] }

 [features]
 default = ["vendored"]
-vendored = ["deltachat/vendored"]
+vendored = ["deltachat/vendored", "deltachat-jsonrpc/vendored"]
 jsonrpc = ["dep:deltachat-jsonrpc"]

--- a/deltachat-jsonrpc/Cargo.toml
+++ b/deltachat-jsonrpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.142.1"
+version = "1.142.2"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 default-run = "deltachat-jsonrpc-server"
@@ -33,7 +33,7 @@ base64 = { workspace = true }

 # optional dependencies
 axum = { version = "0.7", optional = true, features = ["ws"] }
-env_logger = { version = "0.11.3", optional = true }
+env_logger = { version = "0.11.5", optional = true }

 [dev-dependencies]
 tokio = { workspace = true, features = ["full", "rt-multi-thread"] }
--- a/deltachat-jsonrpc/typescript/package.json
+++ b/deltachat-jsonrpc/typescript/package.json
@@ -58,5 +58,5 @@
  },
  "type": "module",
  "types": "dist/deltachat.d.ts",
-  "version": "1.142.1"
+  "version": "1.142.2"
 }
--- a/deltachat-repl/Cargo.toml
+++ b/deltachat-repl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-repl"
-version = "1.142.1"
+version = "1.142.2"
 license = "MPL-2.0"
 edition = "2021"
 repository = "https://github.com/deltachat/deltachat-core-rust"
--- a/deltachat-rpc-client/pyproject.toml
+++ b/deltachat-rpc-client/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "deltachat-rpc-client"
-version = "1.142.1"
+version = "1.142.2"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [
    "Development Status :: 5 - Production/Stable",
--- a/deltachat-rpc-server/Cargo.toml
+++ b/deltachat-rpc-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.142.1"
+version = "1.142.2"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"
@@ -10,8 +10,8 @@ keywords = ["deltachat", "chat", "openpgp", "email", "encryption"]
 categories = ["cryptography", "std", "email"]

 [dependencies]
-deltachat-jsonrpc = { workspace = true, default-features = false }
-deltachat = { workspace = true, default-features = false }
+deltachat-jsonrpc = { workspace = true }
+deltachat = { workspace = true }

 anyhow = { workspace = true }
 futures-lite = { workspace = true }
--- a/deltachat-rpc-server/npm-package/package.json
+++ b/deltachat-rpc-server/npm-package/package.json
@@ -15,5 +15,5 @@
  },
  "type": "module",
  "types": "index.d.ts",
-  "version": "1.142.1"
+  "version": "1.142.2"
 }
--- a/package.json
+++ b/package.json
@@ -55,5 +55,5 @@
    "test:mocha": "mocha node/test/test.mjs --growl --reporter=spec --bail --exit"
  },
  "types": "node/dist/index.d.ts",
-  "version": "1.142.1"
+  "version": "1.142.2"
 }
--- a/python/pyproject.toml
+++ b/python/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "deltachat"
-version = "1.142.1"
+version = "1.142.2"
 description = "Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat"
 readme = "README.rst"
 requires-python = ">=3.7"
--- a/release-date.in
+++ b/release-date.in
@@ -1 +1 @@
-2024-07-30
+2024-08-02
--- a/src/imap/client.rs
+++ b/src/imap/client.rs
@@ -4,6 +4,7 @@ use std::ops::{Deref, DerefMut};
 use anyhow::{bail, format_err, Context as _, Result};
 use async_imap::Client as ImapClient;
 use async_imap::Session as ImapSession;
+use fast_socks5::client::Socks5Stream;
 use tokio::io::BufWriter;

 use super::capabilities::Capabilities;
@@ -12,10 +13,11 @@ use crate::context::Context;
 use crate::net::dns::{lookup_host_with_cache, update_connect_timestamp};
 use crate::net::session::SessionStream;
 use crate::net::tls::wrap_tls;
+use crate::net::update_connection_history;
 use crate::net::{connect_tcp_inner, connect_tls_inner};
 use crate::provider::Socket;
 use crate::socks::Socks5Config;
-use fast_socks5::client::Socks5Stream;
+use crate::tools::time;

 #[derive(Debug)]
 pub(crate) struct Client {
@@ -123,7 +125,9 @@ impl Client {
            let mut first_error = None;
            let load_cache =
                strict_tls && (security == Socket::Ssl || security == Socket::Starttls);
-            for resolved_addr in lookup_host_with_cache(context, host, port, load_cache).await? {
+            for resolved_addr in
+                lookup_host_with_cache(context, host, port, "imap", load_cache).await?
+            {
                let res = match security {
                    Socket::Automatic => bail!("IMAP port security is not configured"),
                    Socket::Ssl => Client::connect_secure(resolved_addr, host, strict_tls).await,
@@ -138,6 +142,8 @@ impl Client {
                        if load_cache {
                            update_connect_timestamp(context, host, &ip_addr).await?;
                        }
+                        update_connection_history(context, "imap", host, port, &ip_addr, time())
+                            .await?;
                        return Ok(client);
                    }
                    Err(err) => {
--- a/src/login_param.rs
+++ b/src/login_param.rs
@@ -259,10 +259,9 @@ impl LoginParam {
        };
        sql.set_raw_config_int(key, server_flags).await?;

-        if let Some(provider) = self.provider {
-            let key = &format!("{prefix}provider");
-            sql.set_raw_config(key, Some(provider.id)).await?;
-        }
+        let key = &format!("{prefix}provider");
+        sql.set_raw_config(key, self.provider.map(|provider| provider.id))
+            .await?;

        Ok(())
    }
@@ -365,7 +364,15 @@ mod tests {

        param.save_as_configured_params(&t).await?;
        let loaded = LoginParam::load_configured_params(&t).await?;
+        assert_eq!(param, loaded);

+        // Remove provider.
+        let param = LoginParam {
+            provider: None,
+            ..param
+        };
+        param.save_as_configured_params(&t).await?;
+        let loaded = LoginParam::load_configured_params(&t).await?;
        assert_eq!(param, loaded);
        Ok(())
    }
--- a/src/net.rs
+++ b/src/net.rs
@@ -10,6 +10,7 @@ use tokio::time::timeout;
 use tokio_io_timeout::TimeoutStream;

 use crate::context::Context;
+use crate::tools::time;

 pub(crate) mod dns;
 pub(crate) mod http;
@@ -25,6 +26,65 @@ use tls::wrap_tls;
 /// This constant should be more than the largest expected RTT.
 pub(crate) const TIMEOUT: Duration = Duration::from_secs(60);

+/// TTL for caches in seconds.
+pub(crate) const CACHE_TTL: u64 = 30 * 24 * 60 * 60;
+
+/// Removes connection history entries after `CACHE_TTL`.
+pub(crate) async fn prune_connection_history(context: &Context) -> Result<()> {
+    let now = time();
+    context
+        .sql
+        .execute(
+            "DELETE FROM connection_history
+             WHERE ? > timestamp + ?",
+            (now, CACHE_TTL),
+        )
+        .await?;
+    Ok(())
+}
+
+pub(crate) async fn update_connection_history(
+    context: &Context,
+    alpn: &str,
+    host: &str,
+    port: u16,
+    addr: &str,
+    now: i64,
+) -> Result<()> {
+    context
+        .sql
+        .execute(
+            "INSERT INTO connection_history (host, port, alpn, addr, timestamp)
+             VALUES (?, ?, ?, ?, ?)
+             ON CONFLICT (host, port, alpn, addr)
+             DO UPDATE SET timestamp=excluded.timestamp",
+            (host, port, alpn, addr, now),
+        )
+        .await?;
+    Ok(())
+}
+
+pub(crate) async fn load_connection_timestamp(
+    context: &Context,
+    alpn: &str,
+    host: &str,
+    port: u16,
+    addr: &str,
+) -> Result<Option<i64>> {
+    let timestamp = context
+        .sql
+        .query_get_value(
+            "SELECT timestamp FROM connection_history
+             WHERE host = ?
+               AND port = ?
+               AND alpn = ?
+               AND addr = ?",
+            (host, port, alpn, addr),
+        )
+        .await?;
+    Ok(timestamp)
+}
+
 /// Returns a TCP connection stream with read/write timeouts set
 /// and Nagle's algorithm disabled with `TCP_NODELAY`.
 ///
@@ -75,7 +135,7 @@ pub(crate) async fn connect_tcp(
 ) -> Result<Pin<Box<TimeoutStream<TcpStream>>>> {
    let mut first_error = None;

-    for resolved_addr in lookup_host_with_cache(context, host, port, load_cache).await? {
+    for resolved_addr in lookup_host_with_cache(context, host, port, "", load_cache).await? {
        match connect_tcp_inner(resolved_addr).await {
            Ok(stream) => {
                return Ok(stream);
--- a/src/net/dns.rs
+++ b/src/net/dns.rs
@@ -6,15 +6,68 @@ use std::str::FromStr;
 use tokio::net::lookup_host;
 use tokio::time::timeout;

+use super::load_connection_timestamp;
 use crate::context::Context;
 use crate::tools::time;

-async fn lookup_host_with_timeout(hostname: &str, port: u16) -> Result<Vec<SocketAddr>> {
-    let res = timeout(super::TIMEOUT, lookup_host((hostname, port)))
+/// Inserts entry into DNS cache
+/// or updates existing one with a new timestamp.
+async fn update_cache(context: &Context, host: &str, addr: &str, now: i64) -> Result<()> {
+    context
+        .sql
+        .execute(
+            "INSERT INTO dns_cache
+             (hostname, address, timestamp)
+             VALUES (?, ?, ?)
+             ON CONFLICT (hostname, address)
+             DO UPDATE SET timestamp=excluded.timestamp",
+            (host, addr, now),
+        )
+        .await?;
+    Ok(())
+}
+
+pub(crate) async fn prune_dns_cache(context: &Context) -> Result<()> {
+    let now = time();
+    context
+        .sql
+        .execute(
+            "DELETE FROM dns_cache
+             WHERE ? > timestamp + ?",
+            (now, super::CACHE_TTL),
+        )
+        .await?;
+    Ok(())
+}
+
+/// Looks up the hostname and updates DNS cache
+/// on success.
+async fn lookup_host_and_update_cache(
+    context: &Context,
+    hostname: &str,
+    port: u16,
+    now: i64,
+) -> Result<Vec<SocketAddr>> {
+    let res: Vec<SocketAddr> = timeout(super::TIMEOUT, lookup_host((hostname, port)))
        .await
        .context("DNS lookup timeout")?
-        .context("DNS lookup failure")?;
-    Ok(res.collect())
+        .context("DNS lookup failure")?
+        .collect();
+
+    for addr in &res {
+        let ip_string = addr.ip().to_string();
+        if ip_string == hostname {
+            // IP address resolved into itself, not interesting to cache.
+            continue;
+        }
+
+        info!(context, "Resolved {hostname}:{port} into {addr}.");
+
+        // Update the cache.
+        update_cache(context, hostname, &ip_string, now).await?;
+    }
+
+    Ok(res)
 }

 // Updates timestamp of the cached entry
@@ -53,18 +106,161 @@ pub(crate) async fn update_connect_timestamp(
    Ok(())
 }

+/// Load hardcoded cache if everything else fails.
+///
+/// See <https://support.delta.chat/t/no-dns-resolution-result/2778> and
+/// <https://github.com/deltachat/deltachat-core-rust/issues/4920> for reasons.
+///
+/// In the future we may pre-resolve all provider database addresses
+/// and build them in.
+fn load_hardcoded_cache(hostname: &str, port: u16) -> Vec<SocketAddr> {
+    match hostname {
+        "mail.sangham.net" => {
+            vec![
+                SocketAddr::new(
+                    IpAddr::V6(Ipv6Addr::new(0x2a01, 0x4f8, 0xc17, 0x798c, 0, 0, 0, 1)),
+                    port,
+                ),
+                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(159, 69, 186, 85)), port),
+            ]
+        }
+        "nine.testrun.org" => {
+            vec![
+                SocketAddr::new(
+                    IpAddr::V6(Ipv6Addr::new(0x2a01, 0x4f8, 0x241, 0x4ce8, 0, 0, 0, 2)),
+                    port,
+                ),
+                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(116, 202, 233, 236)), port),
+            ]
+        }
+        "disroot.org" => {
+            vec![SocketAddr::new(
+                IpAddr::V4(Ipv4Addr::new(178, 21, 23, 139)),
+                port,
+            )]
+        }
+        "mail.riseup.net" => {
+            vec![
+                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(198, 252, 153, 70)), port),
+                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(198, 252, 153, 71)), port),
+            ]
+        }
+        "imap.gmail.com" => {
+            vec![
+                SocketAddr::new(
+                    IpAddr::V6(Ipv6Addr::new(0x2a00, 0x1450, 0x400c, 0xc1f, 0, 0, 0, 0x6c)),
+                    port,
+                ),
+                SocketAddr::new(
+                    IpAddr::V6(Ipv6Addr::new(0x2a00, 0x1450, 0x400c, 0xc1f, 0, 0, 0, 0x6d)),
+                    port,
+                ),
+                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(142, 250, 110, 109)), port),
+                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(142, 250, 110, 108)), port),
+            ]
+        }
+        "smtp.gmail.com" => {
+            vec![
+                SocketAddr::new(
+                    IpAddr::V6(Ipv6Addr::new(0x2a00, 0x1450, 0x4013, 0xc04, 0, 0, 0, 0x6c)),
+                    port,
+                ),
+                SocketAddr::new(IpAddr::V4(Ipv4Addr::new(142, 250, 110, 109)), port),
+            ]
+        }
+        _ => Vec::new(),
+    }
+}
+
+async fn lookup_cache(
+    context: &Context,
+    host: &str,
+    port: u16,
+    alpn: &str,
+    now: i64,
+) -> Result<Vec<SocketAddr>> {
+    let mut res = Vec::new();
+    for cached_address in context
+        .sql
+        .query_map(
+            "SELECT dns_cache.address
+             FROM dns_cache
+             LEFT JOIN connection_history
+               ON dns_cache.hostname = connection_history.host
+               AND dns_cache.address = connection_history.addr
+               AND connection_history.port = ?
+               AND connection_history.alpn = ?
+             WHERE dns_cache.hostname = ?
+             AND ? < dns_cache.timestamp + ?
+             ORDER BY IFNULL(connection_history.timestamp, dns_cache.timestamp) DESC
+             LIMIT 50",
+            (port, alpn, host, now, super::CACHE_TTL),
+            |row| {
+                let address: String = row.get(0)?;
+                Ok(address)
+            },
+            |rows| {
+                rows.collect::<std::result::Result<Vec<String>, _>>()
+                    .map_err(Into::into)
+            },
+        )
+        .await?
+    {
+        match IpAddr::from_str(&cached_address) {
+            Ok(ip_addr) => {
+                let addr = SocketAddr::new(ip_addr, port);
+                res.push(addr);
+            }
+            Err(err) => {
+                warn!(
+                    context,
+                    "Failed to parse cached address {:?}: {:#}.", cached_address, err
+                );
+            }
+        }
+    }
+    Ok(res)
+}
+
+/// Sorts DNS resolution results by connection timestamp in descending order
+/// so IP addresses that we recently connected to successfully are tried first.
+async fn sort_by_connection_timestamp(
+    context: &Context,
+    input: Vec<SocketAddr>,
+    alpn: &str,
+    host: &str,
+) -> Result<Vec<SocketAddr>> {
+    let mut res: Vec<(Option<i64>, SocketAddr)> = Vec::new();
+    for addr in input {
+        let timestamp =
+            load_connection_timestamp(context, alpn, host, addr.port(), &addr.ip().to_string())
+                .await?;
+        res.push((timestamp, addr));
+    }
+    res.sort_by_key(|(ts, _addr)| std::cmp::Reverse(*ts));
+    Ok(res.into_iter().map(|(_ts, addr)| addr).collect())
+}
+
 /// Looks up hostname and port using DNS and updates the address resolution cache.
 ///
+/// `alpn` is used to sort DNS results by the time we have successfully
+/// connected to the IP address using given `alpn`.
+/// If result sorting is not needed or `alpn` is unknown,
+/// pass empty string here, e.g. for HTTP requests
+/// or when resolving the IP address of SOCKS proxy.
+///
 /// If `load_cache` is true, appends cached results not older than 30 days to the end
 /// or entries from fallback cache if there are no cached addresses.
 pub(crate) async fn lookup_host_with_cache(
    context: &Context,
    hostname: &str,
    port: u16,
+    alpn: &str,
    load_cache: bool,
 ) -> Result<Vec<SocketAddr>> {
    let now = time();
-    let mut resolved_addrs = match lookup_host_with_timeout(hostname, port).await {
+    let mut resolved_addrs = match lookup_host_and_update_cache(context, hostname, port, now).await
+    {
        Ok(res) => res,
        Err(err) => {
            warn!(
@@ -74,144 +270,257 @@ pub(crate) async fn lookup_host_with_cache(
            Vec::new()
        }
    };
-
-    for addr in &resolved_addrs {
-        let ip_string = addr.ip().to_string();
-        if ip_string == hostname {
-            // IP address resolved into itself, not interesting to cache.
-            continue;
-        }
-
-        info!(context, "Resolved {}:{} into {}.", hostname, port, &addr);
-
-        // Update the cache.
-        context
-            .sql
-            .execute(
-                "INSERT INTO dns_cache
-                 (hostname, address, timestamp)
-                 VALUES (?, ?, ?)
-                 ON CONFLICT (hostname, address)
-                 DO UPDATE SET timestamp=excluded.timestamp",
-                (hostname, ip_string, now),
-            )
-            .await?;
+    if !alpn.is_empty() {
+        resolved_addrs =
+            sort_by_connection_timestamp(context, resolved_addrs, alpn, hostname).await?;
    }

    if load_cache {
-        for cached_address in context
-            .sql
-            .query_map(
-                "SELECT address
-                 FROM dns_cache
-                 WHERE hostname = ?
-                 AND ? < timestamp + 30 * 24 * 3600
-                 ORDER BY timestamp DESC",
-                (hostname, now),
-                |row| {
-                    let address: String = row.get(0)?;
-                    Ok(address)
-                },
-                |rows| {
-                    rows.collect::<std::result::Result<Vec<_>, _>>()
-                        .map_err(Into::into)
-                },
-            )
-            .await?
-        {
-            match IpAddr::from_str(&cached_address) {
-                Ok(ip_addr) => {
-                    let addr = SocketAddr::new(ip_addr, port);
-                    if !resolved_addrs.contains(&addr) {
-                        resolved_addrs.push(addr);
-                    }
-                }
-                Err(err) => {
-                    warn!(
-                        context,
-                        "Failed to parse cached address {:?}: {:#}.", cached_address, err
-                    );
-                }
+        for addr in lookup_cache(context, hostname, port, alpn, now).await? {
+            if !resolved_addrs.contains(&addr) {
+                resolved_addrs.push(addr);
            }
        }

        if resolved_addrs.is_empty() {
-            // Load hardcoded cache if everything else fails.
-            //
-            // See <https://support.delta.chat/t/no-dns-resolution-result/2778> and
-            // <https://github.com/deltachat/deltachat-core-rust/issues/4920> for reasons.
-            //
-            // In the future we may pre-resolve all provider database addresses
-            // and build them in.
-            match hostname {
-                "mail.sangham.net" => {
-                    resolved_addrs.push(SocketAddr::new(
-                        IpAddr::V6(Ipv6Addr::new(0x2a01, 0x4f8, 0xc17, 0x798c, 0, 0, 0, 1)),
-                        port,
-                    ));
-                    resolved_addrs.push(SocketAddr::new(
-                        IpAddr::V4(Ipv4Addr::new(159, 69, 186, 85)),
-                        port,
-                    ));
-                }
-                "nine.testrun.org" => {
-                    resolved_addrs.push(SocketAddr::new(
-                        IpAddr::V6(Ipv6Addr::new(0x2a01, 0x4f8, 0x241, 0x4ce8, 0, 0, 0, 2)),
-                        port,
-                    ));
-                    resolved_addrs.push(SocketAddr::new(
-                        IpAddr::V4(Ipv4Addr::new(116, 202, 233, 236)),
-                        port,
-                    ));
-                }
-                "disroot.org" => {
-                    resolved_addrs.push(SocketAddr::new(
-                        IpAddr::V4(Ipv4Addr::new(178, 21, 23, 139)),
-                        port,
-                    ));
-                }
-                "mail.riseup.net" => {
-                    resolved_addrs.push(SocketAddr::new(
-                        IpAddr::V4(Ipv4Addr::new(198, 252, 153, 70)),
-                        port,
-                    ));
-                    resolved_addrs.push(SocketAddr::new(
-                        IpAddr::V4(Ipv4Addr::new(198, 252, 153, 71)),
-                        port,
-                    ));
-                }
-                "imap.gmail.com" => {
-                    resolved_addrs.push(SocketAddr::new(
-                        IpAddr::V6(Ipv6Addr::new(0x2a00, 0x1450, 0x400c, 0xc1f, 0, 0, 0, 0x6c)),
-                        port,
-                    ));
-                    resolved_addrs.push(SocketAddr::new(
-                        IpAddr::V6(Ipv6Addr::new(0x2a00, 0x1450, 0x400c, 0xc1f, 0, 0, 0, 0x6d)),
-                        port,
-                    ));
-                    resolved_addrs.push(SocketAddr::new(
-                        IpAddr::V4(Ipv4Addr::new(142, 250, 110, 109)),
-                        port,
-                    ));
-                    resolved_addrs.push(SocketAddr::new(
-                        IpAddr::V4(Ipv4Addr::new(142, 250, 110, 108)),
-                        port,
-                    ));
-                }
-                "smtp.gmail.com" => {
-                    resolved_addrs.push(SocketAddr::new(
-                        IpAddr::V6(Ipv6Addr::new(0x2a00, 0x1450, 0x4013, 0xc04, 0, 0, 0, 0x6c)),
-                        port,
-                    ));
-                    resolved_addrs.push(SocketAddr::new(
-                        IpAddr::V4(Ipv4Addr::new(142, 250, 110, 109)),
-                        port,
-                    ));
-                }
-                _ => {}
-            }
+            return Ok(load_hardcoded_cache(hostname, port));
        }
    }

    Ok(resolved_addrs)
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    use crate::net::update_connection_history;
+    use crate::test_utils::TestContext;
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_sort_by_connection_timestamp() {
+        let alice = &TestContext::new_alice().await;
+        let now = time();
+
+        let ipv6_addr = IpAddr::V6(Ipv6Addr::new(0x2a01, 0x4f8, 0x241, 0x4ce8, 0, 0, 0, 2));
+        let ipv4_addr = IpAddr::V4(Ipv4Addr::new(116, 202, 233, 236));
+
+        assert_eq!(
+            sort_by_connection_timestamp(
+                alice,
+                vec![
+                    SocketAddr::new(ipv6_addr, 993),
+                    SocketAddr::new(ipv4_addr, 993)
+                ],
+                "imap",
+                "nine.testrun.org"
+            )
+            .await
+            .unwrap(),
+            vec![
+                SocketAddr::new(ipv6_addr, 993),
+                SocketAddr::new(ipv4_addr, 993)
+            ]
+        );
+        update_connection_history(
+            alice,
+            "imap",
+            "nine.testrun.org",
+            993,
+            "116.202.233.236",
+            now,
+        )
+        .await
+        .unwrap();
+        assert_eq!(
+            sort_by_connection_timestamp(
+                alice,
+                vec![
+                    SocketAddr::new(ipv6_addr, 993),
+                    SocketAddr::new(ipv4_addr, 993)
+                ],
+                "imap",
+                "nine.testrun.org"
+            )
+            .await
+            .unwrap(),
+            vec![
+                SocketAddr::new(ipv4_addr, 993),
+                SocketAddr::new(ipv6_addr, 993),
+            ]
+        );
+
+        assert_eq!(
+            sort_by_connection_timestamp(
+                alice,
+                vec![
+                    SocketAddr::new(ipv6_addr, 465),
+                    SocketAddr::new(ipv4_addr, 465)
+                ],
+                "smtp",
+                "nine.testrun.org"
+            )
+            .await
+            .unwrap(),
+            vec![
+                SocketAddr::new(ipv6_addr, 465),
+                SocketAddr::new(ipv4_addr, 465),
+            ]
+        );
+        update_connection_history(
+            alice,
+            "smtp",
+            "nine.testrun.org",
+            465,
+            "116.202.233.236",
+            now,
+        )
+        .await
+        .unwrap();
+        assert_eq!(
+            sort_by_connection_timestamp(
+                alice,
+                vec![
+                    SocketAddr::new(ipv6_addr, 465),
+                    SocketAddr::new(ipv4_addr, 465)
+                ],
+                "smtp",
+                "nine.testrun.org"
+            )
+            .await
+            .unwrap(),
+            vec![
+                SocketAddr::new(ipv4_addr, 465),
+                SocketAddr::new(ipv6_addr, 465),
+            ]
+        );
+
+        update_connection_history(
+            alice,
+            "imap",
+            "nine.testrun.org",
+            993,
+            "2a01:4f8:241:4ce8::2",
+            now,
+        )
+        .await
+        .unwrap();
+        assert_eq!(
+            sort_by_connection_timestamp(
+                alice,
+                vec![
+                    SocketAddr::new(ipv6_addr, 993),
+                    SocketAddr::new(ipv4_addr, 993)
+                ],
+                "imap",
+                "nine.testrun.org"
+            )
+            .await
+            .unwrap(),
+            vec![
+                SocketAddr::new(ipv6_addr, 993),
+                SocketAddr::new(ipv4_addr, 993)
+            ]
+        );
+    }
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_lookup_cache() {
+        let alice = &TestContext::new_alice().await;
+
+        let ipv4_addr = IpAddr::V4(Ipv4Addr::new(116, 202, 233, 236));
+        let ipv6_addr = IpAddr::V6(Ipv6Addr::new(0x2a01, 0x4f8, 0x241, 0x4ce8, 0, 0, 0, 2));
+
+        let now = time();
+        assert!(lookup_cache(alice, "nine.testrun.org", 587, "smtp", now)
+            .await
+            .unwrap()
+            .is_empty());
+
+        update_cache(alice, "nine.testrun.org", "116.202.233.236", now)
+            .await
+            .unwrap();
+
+        assert_eq!(
+            lookup_cache(alice, "nine.testrun.org", 587, "smtp", now)
+                .await
+                .unwrap(),
+            vec![SocketAddr::new(ipv4_addr, 587)]
+        );
+
+        // Cache should be returned for other ports and no ALPN as well,
+        // port and ALPN should only affect the order
+        assert_eq!(
+            lookup_cache(alice, "nine.testrun.org", 443, "", now)
+                .await
+                .unwrap(),
+            vec![SocketAddr::new(ipv4_addr, 443)]
+        );
+
+        update_cache(alice, "nine.testrun.org", "2a01:4f8:241:4ce8::2", now + 30)
+            .await
+            .unwrap();
+
+        // New DNS cache entry should go first.
+        assert_eq!(
+            lookup_cache(alice, "nine.testrun.org", 443, "", now + 60)
+                .await
+                .unwrap(),
+            vec![
+                SocketAddr::new(ipv6_addr, 443),
+                SocketAddr::new(ipv4_addr, 443)
+            ],
+        );
+
+        // After successful connection to SMTP over port 465 using IPv4 address,
+        // IPv4 address has higher priority.
+        update_connection_history(
+            alice,
+            "smtp",
+            "nine.testrun.org",
+            465,
+            "116.202.233.236",
+            now + 100,
+        )
+        .await
+        .unwrap();
+        assert_eq!(
+            lookup_cache(alice, "nine.testrun.org", 465, "smtp", now + 120)
+                .await
+                .unwrap(),
+            vec![
+                SocketAddr::new(ipv4_addr, 465),
+                SocketAddr::new(ipv6_addr, 465)
+            ]
+        );
+
+        // For other ports and ALPNs order remains the same.
+        assert_eq!(
+            lookup_cache(alice, "nine.testrun.org", 993, "imap", now + 120)
+                .await
+                .unwrap(),
+            vec![
+                SocketAddr::new(ipv6_addr, 993),
+                SocketAddr::new(ipv4_addr, 993)
+            ],
+        );
+        assert_eq!(
+            lookup_cache(alice, "nine.testrun.org", 465, "imap", now + 120)
+                .await
+                .unwrap(),
+            vec![
+                SocketAddr::new(ipv6_addr, 465),
+                SocketAddr::new(ipv4_addr, 465)
+            ],
+        );
+        assert_eq!(
+            lookup_cache(alice, "nine.testrun.org", 993, "smtp", now + 120)
+                .await
+                .unwrap(),
+            vec![
+                SocketAddr::new(ipv6_addr, 993),
+                SocketAddr::new(ipv4_addr, 993)
+            ],
+        );
+    }
+}
--- a/src/net/http.rs
+++ b/src/net/http.rs
@@ -119,7 +119,7 @@ impl reqwest::dns::Resolve for CustomResolver {
            let port = 443; // Actual port does not matter.

            let socket_addrs =
-                lookup_host_with_cache(&context, hostname.as_str(), port, load_cache).await;
+                lookup_host_with_cache(&context, hostname.as_str(), port, "", load_cache).await;
            match socket_addrs {
                Ok(socket_addrs) => {
                    let addrs: reqwest::dns::Addrs = Box::new(socket_addrs.into_iter());
--- a/src/smtp/connect.rs
+++ b/src/smtp/connect.rs
@@ -10,9 +10,11 @@ use crate::context::Context;
 use crate::net::dns::{lookup_host_with_cache, update_connect_timestamp};
 use crate::net::session::SessionBufStream;
 use crate::net::tls::wrap_tls;
+use crate::net::update_connection_history;
 use crate::net::{connect_tcp_inner, connect_tls_inner};
 use crate::provider::Socket;
 use crate::socks::Socks5Config;
+use crate::tools::time;

 /// Returns TLS, STARTTLS or plaintext connection
 /// using SOCKS5 or direct connection depending on the given configuration.
@@ -50,7 +52,8 @@ pub(crate) async fn connect_stream(
        let mut first_error = None;
        let load_cache = strict_tls && (security == Socket::Ssl || security == Socket::Starttls);

-        for resolved_addr in lookup_host_with_cache(context, host, port, load_cache).await? {
+        for resolved_addr in lookup_host_with_cache(context, host, port, "smtp", load_cache).await?
+        {
            let res = match security {
                Socket::Automatic => bail!("SMTP port security is not configured"),
                Socket::Ssl => connect_secure(resolved_addr, host, strict_tls).await,
@@ -63,6 +66,8 @@ pub(crate) async fn connect_stream(
                    if load_cache {
                        update_connect_timestamp(context, host, &ip_addr).await?;
                    }
+                    update_connection_history(context, "smtp", host, port, &ip_addr, time())
+                        .await?;
                    return Ok(stream);
                }
                Err(err) => {
--- a/src/sql.rs
+++ b/src/sql.rs
@@ -18,6 +18,8 @@ use crate::imex::BLOBS_BACKUP_NAME;
 use crate::location::delete_orphaned_poi_locations;
 use crate::log::LogExt;
 use crate::message::{Message, MsgId, Viewtype};
+use crate::net::dns::prune_dns_cache;
+use crate::net::prune_connection_history;
 use crate::param::{Param, Params};
 use crate::peerstate::Peerstate;
 use crate::stock_str;
@@ -787,6 +789,17 @@ pub async fn housekeeping(context: &Context) -> Result<()> {
        .log_err(context)
        .ok();

+    prune_connection_history(context)
+        .await
+        .context("Failed to prune connection history")
+        .log_err(context)
+        .ok();
+    prune_dns_cache(context)
+        .await
+        .context("Failed to prune DNS cache")
+        .log_err(context)
+        .ok();
+
    // Delete POI locations
    // which don't have corresponding message.
    delete_orphaned_poi_locations(context)
--- a/src/sql/migrations.rs
+++ b/src/sql/migrations.rs
@@ -955,6 +955,22 @@ CREATE INDEX msgs_status_updates_index2 ON msgs_status_updates (uid);
        .await?;
    }

+    inc_and_check(&mut migration_version, 117)?;
+    if dbversion < migration_version {
+        sql.execute_migration(
+            "CREATE TABLE connection_history (
+                host TEXT NOT NULL, -- server hostname
+                port INTEGER NOT NULL, -- server port
+                alpn TEXT NOT NULL, -- ALPN such as smtp or imap
+                addr TEXT NOT NULL, -- IP address
+                timestamp INTEGER NOT NULL, -- timestamp of the most recent successful connection
+                UNIQUE (host, port, alpn, addr)
+            ) STRICT",
+            migration_version,
+        )
+        .await?;
+    }
+
    let new_version = sql
        .get_raw_config_int(VERSION_CFG)
        .await?
Author	SHA1	Message	Date
link2xt	7136a6311c	chore(cargo): update derive_more from 1.0.0-beta.6 to 1.0.0-beta.7	2024-08-03 21:21:56 +00:00
link2xt	39ed587959	Revert "chore(cargo): update rusqlite" This reverts commit `1b92d18777`.	2024-08-03 19:19:55 +00:00
link2xt	c4327a0558	Fix cargo warnings about default-features Otherwise cargo emits these warnings: warning: .../deltachat-core-rust/deltachat-ffi/Cargo.toml: `default-features` is ignored for deltachat, since `default-features` was not specified for `workspace.dependencies.deltachat`, this could become a hard error in the future warning: .../deltachat-core-rust/deltachat-rpc-server/Cargo.toml: `default-features` is ignored for deltachat, since `default-features` was not specified for `workspace.dependencies.deltachat`, this could become a hard error in the future warning: .../deltachat-core-rust/deltachat-rpc-server/Cargo.toml: `default-features` is ignored for deltachat-jsonrpc, since `default-features` was not specified for `workspace.dependencies.deltachat-jsonrpc`, this could become a hard error in the future	2024-08-03 19:08:47 +00:00
link2xt	1b92d18777	chore(cargo): update rusqlite	2024-08-03 19:08:29 +00:00
link2xt	a67503ae4a	chore: remove `backtrace` dependency It is not used directly by `deltachat` crate.	2024-08-02 23:06:30 +00:00
link2xt	c54f39bea0	chore: remove sha2 dependency It is not used since `ce6ec64069`	2024-08-02 23:06:30 +00:00
dependabot[bot]	ff3138fa43	Merge pull request #5830 from deltachat/dependabot/cargo/env_logger-0.11.5	2024-08-02 21:39:16 +00:00
dependabot[bot]	09d46942ca	Merge pull request #5832 from deltachat/dependabot/cargo/tokio-1.39.2	2024-08-02 19:51:34 +00:00
dependabot[bot]	84e365d263	Merge pull request #5833 from deltachat/dependabot/cargo/uuid-1.10.0	2024-08-02 19:50:28 +00:00
dependabot[bot]	b31bcf5561	Merge pull request #5836 from deltachat/dependabot/cargo/quick-xml-0.36.1	2024-08-02 19:43:48 +00:00
link2xt	da50d682e1	chore(release): prepare for 1.142.2	2024-08-02 17:05:43 +00:00
link2xt	094d310f5c	feat: sort DNS results by successful connection timestamp (#5818 )	2024-08-02 16:53:16 +00:00
dependabot[bot]	642eaf92d7	chore(cargo): bump serde from 1.0.203 to 1.0.204 Bumps [serde](https://github.com/serde-rs/serde) from 1.0.203 to 1.0.204. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.203...v1.0.204) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-08-02 13:39:06 -03:00
link2xt	76c032a2c4	fix: reset configured_provider on reconfiguration	2024-08-02 16:31:07 +00:00
dependabot[bot]	a74b04d175	chore(cargo): bump quoted_printable from 0.5.0 to 0.5.1 Bumps [quoted_printable](https://github.com/staktrace/quoted-printable) from 0.5.0 to 0.5.1. - [Commits](https://github.com/staktrace/quoted-printable/compare/v0.5.0...v0.5.1) --- updated-dependencies: - dependency-name: quoted_printable dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-08-02 13:14:21 -03:00
dependabot[bot]	c9448feafc	chore(cargo): bump env_logger from 0.11.3 to 0.11.5 Bumps [env_logger](https://github.com/rust-cli/env_logger) from 0.11.3 to 0.11.5. - [Release notes](https://github.com/rust-cli/env_logger/releases) - [Changelog](https://github.com/rust-cli/env_logger/blob/main/CHANGELOG.md) - [Commits](https://github.com/rust-cli/env_logger/compare/v0.11.3...v0.11.5) --- updated-dependencies: - dependency-name: env_logger dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-08-02 15:51:02 +00:00
dependabot[bot]	8314f3e30c	chore(cargo): bump syn from 2.0.68 to 2.0.72 Bumps [syn](https://github.com/dtolnay/syn) from 2.0.68 to 2.0.72. - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](https://github.com/dtolnay/syn/compare/2.0.68...2.0.72) --- updated-dependencies: - dependency-name: syn dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-08-02 12:45:02 -03:00
dependabot[bot]	935da2db49	Merge pull request #5838 from deltachat/dependabot/cargo/thiserror-1.0.63	2024-08-02 15:41:01 +00:00
dependabot[bot]	b5e95fa1ef	chore(cargo): bump human-panic from 2.0.0 to 2.0.1 Bumps [human-panic](https://github.com/rust-cli/human-panic) from 2.0.0 to 2.0.1. - [Changelog](https://github.com/rust-cli/human-panic/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-cli/human-panic/compare/v2.0.0...v2.0.1) --- updated-dependencies: - dependency-name: human-panic dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-08-02 12:40:06 -03:00
dependabot[bot]	b60d8356cb	chore(cargo): bump serde_json from 1.0.120 to 1.0.122 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.120 to 1.0.122. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.120...v1.0.122) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-08-02 12:39:19 -03:00
link2xt	ee7a7a2f9d	fix: fix compilation on iOS	2024-08-02 15:22:19 +00:00
dependabot[bot]	b5eb824346	Merge pull request #5835 from deltachat/dependabot/cargo/toml-0.8.15	2024-08-02 15:20:33 +00:00
dependabot[bot]	41867b89a0	chore(cargo): bump thiserror from 1.0.61 to 1.0.63 Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.61 to 1.0.63. - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.61...1.0.63) --- updated-dependencies: - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-08-01 21:58:46 +00:00
dependabot[bot]	7e7aa7aba0	chore(cargo): bump quick-xml from 0.35.0 to 0.36.1 Bumps [quick-xml](https://github.com/tafia/quick-xml) from 0.35.0 to 0.36.1. - [Release notes](https://github.com/tafia/quick-xml/releases) - [Changelog](https://github.com/tafia/quick-xml/blob/master/Changelog.md) - [Commits](https://github.com/tafia/quick-xml/compare/v0.35.0...v0.36.1) --- updated-dependencies: - dependency-name: quick-xml dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-08-01 21:57:59 +00:00
dependabot[bot]	fd1dab7c7b	chore(cargo): bump toml from 0.8.14 to 0.8.15 Bumps [toml](https://github.com/toml-rs/toml) from 0.8.14 to 0.8.15. - [Commits](https://github.com/toml-rs/toml/compare/toml-v0.8.14...toml-v0.8.15) --- updated-dependencies: - dependency-name: toml dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-08-01 21:57:38 +00:00
dependabot[bot]	a69f9f01b3	chore(cargo): bump uuid from 1.9.1 to 1.10.0 Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.9.1 to 1.10.0. - [Release notes](https://github.com/uuid-rs/uuid/releases) - [Commits](https://github.com/uuid-rs/uuid/compare/1.9.1...1.10.0) --- updated-dependencies: - dependency-name: uuid dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-08-01 21:56:35 +00:00
dependabot[bot]	c808ed1368	chore(cargo): bump tokio from 1.38.0 to 1.39.2 Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.38.0 to 1.39.2. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.38.0...tokio-1.39.2) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-08-01 21:56:05 +00:00
@@ -1 +1 @@
 -07-30
 -08-02