From 544baa0520a73484c485eab0ead8029218fe2c1d Mon Sep 17 00:00:00 2001
From: Igor Novgorodov <igor.novgorodov@dfinity.org>
Date: Fri, 26 Jun 2026 11:40:29 +0000
Subject: [PATCH] Update crates, remove cloudflare crate

---
 Cargo.lock                | 104 +++++++++++++++-----------------------
 Cargo.toml                |  18 ++-----
 src/cli.rs                |   4 +-
 tools/cloudflare_check.rs |  59 ---------------------
 4 files changed, 49 insertions(+), 136 deletions(-)
 delete mode 100644 tools/cloudflare_check.rs

diff --git a/Cargo.lock b/Cargo.lock
index 97aca132..da1b6d5a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -129,9 +129,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.102"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
+checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3"
 
 [[package]]
 name = "ar_archive_writer"
@@ -710,13 +710,13 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.12.1"
+version = "1.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab"
+checksum = "5cee35f73844aa3014bb606320a6c1f010249dbdf43342fe54b5a4f6a8ed4b79"
 dependencies = [
  "memchr",
  "regex-automata",
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -824,9 +824,9 @@ checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0"
 
 [[package]]
 name = "candid"
-version = "0.10.29"
+version = "0.10.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f781afa4a1303e3eab4ada0720a874942bcfa936ce01b816ac6378945c43a9"
+checksum = "1347fd6b24f5ad23e4ab16d49551a03d396410dcb086e8f969c21efdf4b1dbd8"
 dependencies = [
  "anyhow",
  "binread",
@@ -847,9 +847,9 @@ dependencies = [
 
 [[package]]
 name = "candid_derive"
-version = "0.10.29"
+version = "0.10.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad6ae8e7944dd0035651bc0e7b3a3e4cb16f5fc43f8ae4fd76b36ff2cd52759f"
+checksum = "ad381629d2d2940899c3a784ccd4fe59e255b5714e7520f016f839f07d2236e7"
 dependencies = [
  "lazy_static",
  "proc-macro2",
@@ -900,9 +900,9 @@ dependencies = [
 
 [[package]]
 name = "chacha20"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
+checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81"
 dependencies = [
  "cfg-if",
  "cpufeatures 0.3.0",
@@ -1014,24 +1014,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
 
-[[package]]
-name = "cloudflare"
-version = "0.14.1"
-source = "git+https://github.com/dfinity/cloudflare-rs?rev=812009807d090b3c18ea6e2e28a7ea99ae883691#812009807d090b3c18ea6e2e28a7ea99ae883691"
-dependencies = [
- "chrono",
- "http 1.4.2",
- "reqwest 0.13.4",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "serde_with",
- "thiserror 2.0.18",
- "url",
- "urlencoding",
- "uuid",
-]
-
 [[package]]
 name = "cmake"
 version = "0.1.58"
@@ -2346,6 +2328,7 @@ dependencies = [
  "rand 0.10.1",
  "rustls",
  "rustls-pki-types",
+ "rustls-platform-verifier",
  "thiserror 2.0.18",
  "time",
  "tinyvec",
@@ -2689,9 +2672,9 @@ dependencies = [
 
 [[package]]
 name = "ic-bn-lib"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3286b4c6224aa495f5e499b8535157018cbf3637aa956d3808fdb920dd6e0bb2"
+checksum = "eea2c1f3aad0a4402aecc624cda39efbafc7dd6645c7f8ab68fe0b99620dcf02"
 dependencies = [
  "ahash",
  "anyhow",
@@ -2706,7 +2689,6 @@ dependencies = [
  "candid",
  "chacha20poly1305",
  "clap",
- "cloudflare",
  "derive-new",
  "flate2",
  "fqdn",
@@ -2781,16 +2763,15 @@ dependencies = [
 
 [[package]]
 name = "ic-bn-lib-common"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "549faca5c1a58b591e4fdf7742454aede9ec6ad508761d5bb052ccebddffcd2e"
+checksum = "9ddfc3775a8bd5aff225bc20aaadb4da46fd9087363c7c510bb264fa6a1f480f"
 dependencies = [
  "anyhow",
  "async-trait",
  "axum",
  "candid",
  "clap",
- "cloudflare",
  "derive-new",
  "fqdn",
  "hickory-proto",
@@ -2961,9 +2942,9 @@ dependencies = [
 
 [[package]]
 name = "ic-custom-domains-backend"
-version = "0.2.1"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6655ea076ea14144139cc38e0a75907016bd68b9af4a795ac2e3da712bf6084"
+checksum = "962142d708266188d2be60dd6a6e27704c3c4363ac4c4a3af843b310a70e3731"
 dependencies = [
  "anyhow",
  "axum",
@@ -2993,9 +2974,9 @@ dependencies = [
 
 [[package]]
 name = "ic-custom-domains-base"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ce0d7b9b102d7680752d59016af984d223e6855bb185aefe3297bde5347854"
+checksum = "74464dd81ad40870fa648b41a771f0f6f4ce4b2f824fe9194fe6857d293d8ef2"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3024,9 +3005,9 @@ dependencies = [
 
 [[package]]
 name = "ic-custom-domains-canister-api"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98ce91ac62ff60b8031d2a6e9c8e3d1ea2460d0868fc6e2f45e97322a49378dc"
+checksum = "268df6565445943a8cf4bd1c2d6d86c33c65e23b32e7d3f155a7be8d90a07166"
 dependencies = [
  "candid",
  "derive-new",
@@ -3037,9 +3018,9 @@ dependencies = [
 
 [[package]]
 name = "ic-custom-domains-canister-client"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c30f0ddaea8a7550f11c5e72a9dda8abd3742e08efd8f80ec95e41b33b17587"
+checksum = "52850559b366e2095d912b5f57a97cd0288c422e6e24f84a5514988ba2bd84ff"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -3086,7 +3067,6 @@ dependencies = [
  "bytes",
  "candid",
  "clap",
- "cloudflare",
  "console-subscriber",
  "criterion",
  "ctrlc",
@@ -3731,9 +3711,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.102"
+version = "0.3.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03d04c30968dffe80775bd4d7fb676131cd04a1fb46d2686dbffbaec2d9dfd31"
+checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102"
 dependencies = [
  "cfg-if",
  "futures-util",
@@ -3943,9 +3923,9 @@ checksum = "dae608c151f68243f2b000364e1f7b186d9c29845f7d2d85bd31b9ad77ad552b"
 
 [[package]]
 name = "mail-auth"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62a9d0c96cc84030705fec4bc4789fa918c89caec0d95ce7ee96b6f922d4a664"
+checksum = "7d3c5a279d798bf41bfcf94ee593a34b545fb2010ebf5cfce3416d6b4019f697"
 dependencies = [
  "aws-lc-rs",
  "flate2",
@@ -4995,7 +4975,7 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
 dependencies = [
- "chacha20 0.10.0",
+ "chacha20 0.10.1",
  "getrandom 0.4.3",
  "rand_core 0.10.1",
 ]
@@ -5278,7 +5258,6 @@ dependencies = [
  "hyper-util",
  "js-sys",
  "log",
- "mime_guess",
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
@@ -5288,6 +5267,7 @@ dependencies = [
  "rustls-platform-verifier",
  "serde",
  "serde_json",
+ "serde_urlencoded",
  "sync_wrapper",
  "tokio",
  "tokio-rustls",
@@ -6994,9 +6974,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.125"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ddb3f79143bced6de84270411622a2699cee572fc0875aeaf1e7867cf9fca1a"
+checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -7007,9 +6987,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.75"
+version = "0.4.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "503b14d284f2c8dac03b819967e155ea753f573586193b2b2c95990cb5d69280"
+checksum = "c62df1340f32221cb9c54d6a27b030e3dba64361d4a95bed55f9aacb44da291d"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -7017,9 +6997,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.125"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e21a184b13fb19e157296e2c46056aec9092264fab83e4ba59e68c61b323c3d"
+checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -7027,9 +7007,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.125"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fecefd9c35bd935a20fc3fc344b5f29138961e4f47fb03297d88f2587afb5ebd"
+checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e"
 dependencies = [
  "bumpalo",
  "proc-macro2",
@@ -7040,9 +7020,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.125"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23939e44bb9a5d7576fa2b563dc2e136628f1224e88a8deed09e04858b77871f"
+checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24"
 dependencies = [
  "unicode-ident",
 ]
@@ -7118,9 +7098,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.102"
+version = "0.3.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6430a72df5eb332242960fe84b3002a241163998241eb596d4f739b9757061d"
+checksum = "8622dcb61c0bcc9fffa6938bed81210af2da9a7e4a1a834b2e37a59b6dfb6141"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
diff --git a/Cargo.toml b/Cargo.toml
index 8f95162e..26b10941 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,9 +25,6 @@ async-trait = "0.1.83"
 axum = { version = "0.8.1", features = ["macros"] }
 candid = "0.10.10"
 clap = { version = "4.5.20", features = ["derive", "string", "env"] }
-cloudflare = { version = "0.14.0", default-features = false, features = [
-    "rustls-tls",
-] }
 console-subscriber = { version = "0.5.0", optional = true }
 ctrlc = { version = "3.4.5", features = ["termination"] }
 derive-new = "0.7.0"
@@ -38,15 +35,15 @@ http = "1.3.1"
 http-body = "1.0.1"
 http-body-util = "0.1.2"
 humantime = "2.2.0"
-ic-bn-lib = { version = "0.2.1", features = [
+ic-bn-lib = { version = "0.2.2", features = [
     "acme",
     "vector",
     "cert-providers",
     "clients-hyper",
 ] }
-ic-bn-lib-common = "0.2.1"
-ic-custom-domains-backend = "0.2"
-ic-custom-domains-base = "0.2.3"
+ic-bn-lib-common = "0.2.2"
+ic-custom-domains-backend = "0.2.4"
+ic-custom-domains-base = "0.2.4"
 ic-http-certification = { version = "3.1.0", optional = true }
 ic-transport-types = "0.47"
 ic-http-gateway-protocol = { package = "ic-http-gateway-protocol", git = "https://github.com/dfinity/ic-http-gateway-protocol", tag = "v0.5.1" }
@@ -119,9 +116,6 @@ panic = "abort"
 [lints.rust]
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tokio_unstable)'] }
 
-[patch.crates-io]
-cloudflare = { git = "https://github.com/dfinity/cloudflare-rs", rev = "812009807d090b3c18ea6e2e28a7ea99ae883691" }
-
 [package.metadata.cargo-all-features]
 always_include_features = ["debug"]
 denylist = ["bench", "tokio_console"]
@@ -145,7 +139,3 @@ harness = false
 [[bin]]
 name = "create-acme-account"
 path = "tools/create_acme_account.rs"
-
-[[bin]]
-name = "cloudflare-check"
-path = "tools/cloudflare_check.rs"
diff --git a/src/cli.rs b/src/cli.rs
index 0ffc0528..98098062 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -11,6 +11,8 @@ use humantime::parse_duration;
 #[cfg(feature = "smtp")]
 use ic_bn_lib::smtp::cli::SmtpServerCli;
 #[cfg(feature = "acme")]
+use ic_bn_lib::tls::acme::dns::cloudflare::DEFAULT_CLOUDFLARE_URL;
+#[cfg(feature = "acme")]
 use ic_bn_lib_common::types::acme::{AcmeUrl, Challenge, DnsBackend};
 use ic_bn_lib_common::{
     parse_size, parse_size_decimal, parse_size_usize,
@@ -391,7 +393,7 @@ pub struct Acme {
     pub acme_dns_backend: DnsBackend,
 
     /// Cloudflare API URL
-    #[clap(env, long, default_value = "https://api.cloudflare.com/client/v4/")]
+    #[clap(env, long, default_value = DEFAULT_CLOUDFLARE_URL)]
     pub acme_dns_cloudflare_url: Url,
 
     /// File from which to read API token if DNS backend is Cloudflare
diff --git a/tools/cloudflare_check.rs b/tools/cloudflare_check.rs
deleted file mode 100644
index 2a51eda2..00000000
--- a/tools/cloudflare_check.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-use clap::Parser;
-use cloudflare::{
-    endpoints::zones::zone::{ListZones, ListZonesParams, Zone},
-    framework::{
-        Environment,
-        auth::Credentials,
-        client::{ClientConfig, async_api::Client},
-    },
-};
-
-#[derive(Parser)]
-pub struct Cli {
-    #[clap(env, long)]
-    pub zone: String,
-
-    #[clap(env, long)]
-    pub token: String,
-}
-
-#[tokio::main]
-async fn main() {
-    let cli = Cli::parse();
-
-    let credentials = Credentials::UserAuthToken {
-        token: cli.token.clone(),
-    };
-
-    let client = Client::new(
-        credentials,
-        ClientConfig::default(),
-        Environment::Custom("https://api.cloudflare.com/client/v4/".to_string()),
-    )
-    .unwrap();
-
-    let resp = client
-        .request(&ListZones {
-            params: ListZonesParams {
-                name: Some(cli.zone.clone()),
-                status: None,
-                page: None,
-                per_page: None,
-                order: None,
-                direction: None,
-                search_match: None,
-            },
-        })
-        .await
-        .unwrap();
-
-    let zone_id = match resp.result.first() {
-        Some(Zone { id, .. }) => id.clone(),
-        None => {
-            println!("Zone '{}' not found", cli.zone);
-            return;
-        }
-    };
-
-    println!("Zone '{}' found with id {zone_id}", cli.zone);
-}