update conflicts

client/src/main.rs

@@ -31,12 +31,12 @@ const KEYGEN_URL: &str = "http://localhost:8080/keygen";
 const AUTHORIZE_URL: &str = "http://localhost:8080/authorize";
 const EXECUTE_URL: &str = "http://localhost:8081/execute";
 
-const BROADCAST_URL: &str = "https://api.explorer.aleo.org/v1/testnet/transaction/broadcast";
-const STATE_ROOT_URL: &str = "https://api.explorer.aleo.org/v1/testnet/stateRoot/latest";
+const BROADCAST_URL: &str = "http://localhost:3033/canary/transaction/broadcast";
+const STATE_ROOT_URL: &str = "http://localhost:3033/canary/stateRoot/latest";
 
 const DEVNET_PRIVATE_KEY: &str = "APrivateKey1zkp8CZNn3yeCseEtxuVPbDCwSyhGW6yZKUYKfgXmcpoGPWH";
 
-type CurrentNetwork = snarkvm::prelude::TestnetV0;
+type CurrentNetwork = snarkvm::prelude::CanaryV0;
 
 #[tokio::main]
 async fn main() -> Result<()> {

execute-service/src/main.rs

@@ -31,11 +31,15 @@ struct Opt {
 async fn run<N: Network>(port: u16) {
     pretty_env_logger::init();
 
-    let routes = execute_route::<N>().with(warp::trace(
-        |info| tracing::debug_span!("Debugging headers", headers = ?info.request_headers()),
-    ));
+    let routes = execute_route::<N>()
+        .with(warp::trace(
+            |info| tracing::debug_span!("Debugging headers", headers = ?info.request_headers()),
+        ))
+        .or(health_route().with(warp::trace(
+            |info| tracing::debug_span!("Debugging headers", headers = ?info.request_headers()),
+        )));
 
-    warp::serve(routes).run(([127, 0, 0, 1], port)).await;
+    warp::serve(routes).run(([0, 0, 0, 0], port)).await;
 }
 
 #[tokio::main]

execute-service/src/routes.rs

@@ -41,3 +41,13 @@ pub fn execute_route<N: Network>() -> impl Filter<Extract = impl Reply, Error =
             Ok(response)
         })
 }
+
+// GET /health
+pub fn health_route(
+) -> impl Filter<Extract = (warp::reply::WithStatus<&'static str>,), Error = warp::Rejection> + Clone
+{
+    warp::get()
+        .and(warp::path("health"))
+        .and(warp::path::end())
+        .map(|| warp::reply::with_status("Execute Service is up", warp::http::StatusCode::OK))
+}