Merge branch 'refs/heads/next' into polydez-refactor-deltas-in-db

# Conflicts: # crates/store/Cargo.toml
0xPolygonMiden · Dec 2, 2024 · 560d00d · 560d00d
2 parents 8552b12 + 54095db
commit 560d00d
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Enhancements
 
 - Added `GetAccountProofs` endpoint (#506).
+- Support Https in endpoint configuration (#556).
 
 ### Changes
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/node/src/config.rs b/bin/node/src/config.rs
@@ -74,7 +74,7 @@ impl NodeConfig {
 mod tests {
     use figment::Jail;
     use miden_node_store::config::StoreConfig;
-    use miden_node_utils::config::{load_config, Endpoint};
+    use miden_node_utils::config::{load_config, Endpoint, Protocol};
 
     use super::NodeConfig;
     use crate::{
@@ -93,10 +93,10 @@ mod tests {
                     verify_tx_proofs = true
 
                     [rpc]
-                    endpoint = { host = "127.0.0.1",  port = 8080 }
+                    endpoint = { host = "127.0.0.1",  port = 8080, protocol = "Http" }
 
                     [store]
-                    endpoint = { host = "127.0.0.1",  port = 8080 }
+                    endpoint = { host = "127.0.0.1",  port = 8080, protocol = "Https" }
                     database_filepath = "local.sqlite3"
                     genesis_filepath = "genesis.dat"
                     blockstore_dir = "blocks"
@@ -112,19 +112,22 @@ mod tests {
                         endpoint: Endpoint {
                             host: "127.0.0.1".to_string(),
                             port: 8080,
+                            protocol: Protocol::default()
                         },
                         verify_tx_proofs: true
                     },
                     rpc: NormalizedRpcConfig {
                         endpoint: Endpoint {
                             host: "127.0.0.1".to_string(),
                             port: 8080,
+                            protocol: Protocol::Http
                         },
                     },
                     store: StoreConfig {
                         endpoint: Endpoint {
                             host: "127.0.0.1".to_string(),
                             port: 8080,
+                            protocol: Protocol::Https
                         },
                         database_filepath: "local.sqlite3".into(),
                         genesis_filepath: "genesis.dat".into(),

diff --git a/crates/rpc/src/config.rs b/crates/rpc/src/config.rs
@@ -1,7 +1,7 @@
 use std::fmt::{Display, Formatter};
 
 use miden_node_utils::config::{
-    Endpoint, DEFAULT_BLOCK_PRODUCER_PORT, DEFAULT_NODE_RPC_PORT, DEFAULT_STORE_PORT,
+    Endpoint, Protocol, DEFAULT_BLOCK_PRODUCER_PORT, DEFAULT_NODE_RPC_PORT, DEFAULT_STORE_PORT,
 };
 use serde::{Deserialize, Serialize};
 
@@ -39,6 +39,7 @@ impl Default for RpcConfig {
             endpoint: Endpoint {
                 host: "0.0.0.0".to_string(),
                 port: DEFAULT_NODE_RPC_PORT,
+                protocol: Protocol::default(),
             },
             store_url: Endpoint::localhost(DEFAULT_STORE_PORT).to_string(),
             block_producer_url: Endpoint::localhost(DEFAULT_BLOCK_PRODUCER_PORT).to_string(),

diff --git a/crates/store/Cargo.toml b/crates/store/Cargo.toml
@@ -12,15 +12,15 @@ homepage.workspace = true
 repository.workspace = true
 
 [dependencies]
-deadpool-sqlite = { version = "0.8", features = ["rt_tokio_1"] }
+deadpool-sqlite = { version = "0.9.0", features = ["rt_tokio_1"] }
 hex = { version = "0.4" }
 miden-lib = { workspace = true }
 miden-node-proto = { workspace = true }
 miden-node-utils = { workspace = true }
 miden-objects = { workspace = true }
 num-derive = { version = "0.4" }
 num-traits = { version = "0.2" }
-rusqlite = { version = "0.31", features = ["array", "buildtime_bindgen", "bundled"] }
+rusqlite = { version = "0.32.1", features = ["array", "buildtime_bindgen", "bundled"] }
 rusqlite_migration = { version = "1.0" }
 serde = { version = "1.0", features = ["derive"] }
 thiserror = { workspace = true }

diff --git a/crates/utils/src/config.rs b/crates/utils/src/config.rs
@@ -17,18 +17,31 @@ pub const DEFAULT_BLOCK_PRODUCER_PORT: u16 = 48046;
 pub const DEFAULT_STORE_PORT: u16 = 28943;
 pub const DEFAULT_FAUCET_SERVER_PORT: u16 = 8080;
 
+#[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug, Serialize, Deserialize, Default)]
+pub enum Protocol {
+    #[default]
+    Http,
+    Https,
+}
 /// The `(host, port)` pair for the server's listening socket.
 #[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug, Serialize, Deserialize)]
 pub struct Endpoint {
     /// Host used by the store.
     pub host: String,
     /// Port number used by the store.
     pub port: u16,
+    /// Protocol type: http or https.
+    #[serde(default)]
+    pub protocol: Protocol,
 }
 
 impl Endpoint {
     pub fn localhost(port: u16) -> Self {
-        Endpoint { host: "localhost".to_string(), port }
+        Endpoint {
+            host: "localhost".to_string(),
+            port,
+            protocol: Protocol::default(),
+        }
     }
 }
 
@@ -41,7 +54,17 @@ impl ToSocketAddrs for Endpoint {
 
 impl Display for Endpoint {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        f.write_fmt(format_args!("http://{}:{}", self.host, self.port))
+        let Endpoint { protocol, host, port } = self;
+        f.write_fmt(format_args!("{protocol}://{host}:{port}"))
+    }
+}
+
+impl Display for Protocol {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Protocol::Http => f.write_str("http"),
+            Protocol::Https => f.write_str("https"),
+        }
     }
 }