DO NOT MERGE: this is essentially just dusterbloom/neutron-testnet-websocket-url syncd with main (for testing the rust cw client)

.cursorignore

@@ -0,0 +1,4 @@
+# Add directories or file patterns to ignore during indexing (e.g. foo/ or *.csv)
+.js
+node_modules/
+target/

Cargo.toml

@@ -47,7 +47,7 @@ k256 = { version = "0.13.2", default-features = false, features = [
 ] }
 num-bigint = { version = "0.4.4", default-features = false }
 p256 = { version = "0.13.2", default-features = false }
-prost = { version = "0.13.1", default-features = false }
+prost = { version = "0.13", default-features = false }
 rand = { version = "0.8.5", default-features = false, features = ["getrandom"] }
 rand_core = { version = "0.6", default-features = false, features = ["std"] }
 reqwest = { version = "0.12.2", default-features = false, features = [

crates/cli/Cargo.toml

@@ -47,6 +47,7 @@ toml = "0.8.19"
 figment = { version = "0.10.19", features = ["env", "toml"] }
 clearscreen = "3.0.0"
 cargo_metadata = "0.18.1"
+fs2 ="0.4.3"
 
 # cosmos
 cosmrs.workspace = true

crates/cli/src/cli.rs

@@ -125,6 +125,11 @@ pub struct HandshakeArgs {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub node_url: Option<String>,
 
+    /// <host>:<port> to tendermint rpc interface for this chain
+    #[arg(long)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub websocket_url: Option<String>,
+
     /// RPC interface for the Quartz enclave
     #[arg(long)]
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -192,6 +197,11 @@ pub struct EnclaveStartArgs {
     #[arg(long)]
     pub unsafe_trust_latest: bool,
 
+    /// <host>:<port> to tendermint rpc interface for this chain
+    #[arg(long)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub websocket_url: Option<String>,
+
     /// FMSPC (Family-Model-Stepping-Platform-Custom SKU); required if `MOCK_SGX` is not set
     #[arg(long)]
     #[serde(skip_serializing_if = "Option::is_none")]

crates/cli/src/config.rs

@@ -22,6 +22,10 @@ pub struct Config {
     #[serde(default = "default_node_url")]
     pub node_url: String,
 
+    /// Full WebSocket URL for this chain
+    #[serde(default = "default_websocket_url")]
+    pub websocket_url: String,
+
     /// RPC interface for the Quartz enclave
     #[serde(default = "default_rpc_addr")]
     pub enclave_rpc_addr: String,
@@ -53,15 +57,19 @@ fn default_rpc_addr() -> String {
 }
 
 fn default_node_url() -> String {
-    "127.0.0.1:26657".to_string()
+    "https://rpc-falcron.pion-1.ntrn.tech".to_string()
+}
+
+fn default_websocket_url() -> String {
+    "wss://rpc-falcron.pion-1.ntrn.tech/websocket".to_string()
 }
 
 fn default_tx_sender() -> String {
-    String::from("admin")
+    String::from("val1")
 }
 
 fn default_chain_id() -> ChainId {
-    "testing".parse().expect("default chain_id failed")
+    "pion-1".parse().expect("default chain_id failed")
 }
 
 fn default_port() -> u16 {
@@ -79,6 +87,7 @@ impl Default for Config {
             tx_sender: default_tx_sender(),
             chain_id: default_chain_id(),
             node_url: default_node_url(),
+            websocket_url: default_websocket_url(),
             enclave_rpc_addr: default_rpc_addr(),
             enclave_rpc_port: default_port(),
             app_dir: default_app_dir(),

crates/cli/src/handler/contract_deploy.rs

@@ -9,10 +9,7 @@ use serde_json::json;
 use tendermint_rpc::HttpClient;
 use tracing::{debug, info};
 
-use super::utils::{
-    helpers::block_tx_commit,
-    types::{Log, WasmdTxResponse},
-};
+use super::utils::{helpers::block_tx_commit, types::WasmdTxResponse};
 use crate::{
     config::Config,
     error::Error,
@@ -68,9 +65,9 @@ async fn deploy(
     args: ContractDeployRequest,
     config: &Config,
 ) -> Result<(u64, String), anyhow::Error> {
-    let httpurl = Url::parse(&format!("http://{}", config.node_url))?;
+    let httpurl = Url::parse(&config.node_url)?;
     let tmrpc_client = HttpClient::new(httpurl.as_str())?;
-    let cw_client = CliWasmdClient::new(Url::parse(httpurl.as_str())?);
+    let cw_client = CliWasmdClient::new(httpurl);
 
     info!("🚀 Deploying {} Contract", args.label);
     let code_id = if config.contract_has_changed(wasm_bin_path).await? {
@@ -79,10 +76,32 @@ async fn deploy(
             &config.tx_sender,
             wasm_bin_path.display().to_string(),
         )?)?;
-        let res = block_tx_commit(&tmrpc_client, deploy_output.txhash).await?;
+        info!("Deploy output: {:?}", deploy_output);
 
-        let log: Vec<Log> = serde_json::from_str(&res.tx_result.log)?;
-        let code_id: u64 = log[0].events[1].attributes[1].value.parse()?;
+        let res = block_tx_commit(&tmrpc_client, deploy_output.txhash).await?;
+        // info!("Deploy response {:?}", res);
+        info!("TX result log: {}", res.tx_result.log);
+
+        // let log: Vec<Log> = serde_json::from_str(&res.tx_result.log)?;
+        // let code_id: u64 = log[0].events[1].attributes[1].value.parse()?;
+        // config.save_codeid_to_cache(wasm_bin_path, code_id).await?;
+
+        // Find the 'code_id' attribute
+        let code_id = res
+            .tx_result
+            .events
+            .iter()
+            .find(|event| event.kind == "store_code")
+            .and_then(|event| {
+                event
+                    .attributes
+                    .iter()
+                    .find(|attr| attr.key_str().unwrap_or("") == "code_id")
+            })
+            .and_then(|attr| attr.value_str().ok().and_then(|v| v.parse().ok()))
+            .ok_or_else(|| anyhow::anyhow!("Failed to find code_id in the transaction result"))?;
+
+        info!("Code ID: {}", code_id);
         config.save_codeid_to_cache(wasm_bin_path, code_id).await?;
 
         code_id
@@ -108,8 +127,24 @@ async fn deploy(
     )?)?;
     let res = block_tx_commit(&tmrpc_client, init_output.txhash).await?;
 
-    let log: Vec<Log> = serde_json::from_str(&res.tx_result.log)?;
-    let contract_addr: &String = &log[0].events[1].attributes[0].value;
+    // info!("Init response: {:?}", res);
+
+    // Find the '_contract_address' attribute
+    let contract_addr: String = res
+        .tx_result
+        .events
+        .iter()
+        .find(|event| event.kind == "instantiate")
+        .and_then(|event| {
+            event
+                .attributes
+                .iter()
+                .find(|attr| attr.key_str().unwrap_or("") == "_contract_address")
+        })
+        .and_then(|attr| attr.value_str().ok().and_then(|v| v.parse().ok()))
+        .ok_or_else(|| {
+            anyhow::anyhow!("Failed to find contract_address in the transaction result")
+        })?;
 
     info!("🚀 Successfully deployed and instantiated contract!");
     info!("🆔 Code ID: {}", code_id);