Merge pull request AleoNet#3408 from ProvableHQ/fix/cdn

[Fix] Fix `Scan` and update CDN TLS version

cli/src/commands/developer/scan.rs

@@ -15,6 +15,7 @@
 
 #![allow(clippy::type_complexity)]
 
+use crate::commands::CDN_BASE_URL;
 use snarkvm::{
     console::network::{CanaryV0, MainnetV0, Network, TestnetV0},
     prelude::{Ciphertext, Field, FromBytes, Plaintext, PrivateKey, Record, ViewKey, block::Block},
@@ -31,8 +32,6 @@ use std::{
 use zeroize::Zeroize;
 
 const MAX_BLOCK_RANGE: u32 = 50;
-// TODO (raychu86): This should be configurable based on network.
-const CDN_ENDPOINT: &str = "https://s3.us-west-1.amazonaws.com/testnet3.blocks/phase3";
 
 /// Scan the snarkOS node for records.
 #[derive(Debug, Parser, Zeroize)]
@@ -172,6 +171,16 @@ impl Scan {
         }
     }
 
+    /// Returns the CDN to prefetch initial blocks from, from the given configurations.
+    fn parse_cdn<N: Network>() -> Result<String> {
+        match N::ID {
+            MainnetV0::ID => Ok(format!("{CDN_BASE_URL}/mainnet/v0")),
+            TestnetV0::ID => Ok(format!("{CDN_BASE_URL}/testnet/v0")),
+            CanaryV0::ID => Ok(format!("{CDN_BASE_URL}/canary/v0")),
+            _ => bail!("Unknown network ID ({})", N::ID),
+        }
+    }
+
     /// Fetch owned ciphertext records from the endpoint.
     fn fetch_records<N: Network>(
         private_key: Option<PrivateKey<N>>,
@@ -215,11 +224,13 @@ impl Scan {
         let mut request_start = match is_development_network {
             true => start_height,
             false => {
+                // Parse the CDN endpoint.
+                let cdn_endpoint = Self::parse_cdn::<N>()?;
                 // Scan the CDN first for records.
                 Self::scan_from_cdn(
                     start_height,
                     end_height,
-                    CDN_ENDPOINT.to_string(),
+                    cdn_endpoint,
                     endpoint.to_string(),
                     private_key,
                     *view_key,

cli/src/commands/start.rs

@@ -59,7 +59,7 @@ const DEVELOPMENT_MODE_RNG_SEED: u64 = 1234567890u64;
 const DEVELOPMENT_MODE_NUM_GENESIS_COMMITTEE_MEMBERS: u16 = 4;
 
 /// The CDN base url.
-const CDN_BASE_URL: &str = "https://blocks.aleo.org";
+pub(crate) const CDN_BASE_URL: &str = "https://blocks.aleo.org";
 
 /// A mapping of `staker_address` to `(validator_address, withdrawal_address, amount)`.
 #[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]

node/cdn/Cargo.toml

@@ -41,6 +41,7 @@ optional = true
 
 [dependencies.reqwest]
 version = "0.11"
+features = [ "rustls-tls" ]
 
 [dependencies.serde]
 version = "1"

node/cdn/src/blocks.rs

@@ -107,7 +107,7 @@ pub async fn load_blocks<N: Network>(
     process: impl FnMut(Block<N>) -> Result<()> + Clone + Send + Sync + 'static,
 ) -> Result<u32, (u32, anyhow::Error)> {
     // Create a Client to maintain a connection pool throughout the sync.
-    let client = match Client::builder().build() {
+    let client = match Client::builder().use_rustls_tls().build() {
         Ok(client) => client,
         Err(error) => {
             return Err((start_height.saturating_sub(1), anyhow!("Failed to create a CDN request client - {error}")));
@@ -439,7 +439,7 @@ mod tests {
 
     type CurrentNetwork = MainnetV0;
 
-    const TEST_BASE_URL: &str = "https://s3.us-west-1.amazonaws.com/testnet3.blocks/phase3";
+    const TEST_BASE_URL: &str = "https://blocks.aleo.org/mainnet/v0";
 
     fn check_load_blocks(start: u32, end: Option<u32>, expected: usize) {
         let blocks = Arc::new(RwLock::new(Vec::new()));
@@ -494,7 +494,7 @@ mod tests {
     #[test]
     fn test_cdn_height() {
         let rt = tokio::runtime::Runtime::new().unwrap();
-        let client = reqwest::Client::builder().build().unwrap();
+        let client = reqwest::Client::builder().use_rustls_tls().build().unwrap();
         rt.block_on(async {
             let height = cdn_height::<BLOCKS_PER_FILE>(&client, TEST_BASE_URL).await.unwrap();
             assert!(height > 0);
@@ -505,7 +505,7 @@ mod tests {
     fn test_cdn_get() {
         let rt = tokio::runtime::Runtime::new().unwrap();
         rt.block_on(async {
-            let client = reqwest::Client::new();
+            let client = reqwest::Client::builder().use_rustls_tls().build().unwrap();
             let height =
                 cdn_get::<u32>(client, &format!("{TEST_BASE_URL}/mainnet/latest/height"), "height").await.unwrap();
             assert!(height > 0);