Bump Clarity, Web30, and DeepSpace versions

althea-net · Dec 4, 2024 · 3bb1b85 · 3bb1b85
1 parent cd8292c
commit 3bb1b85
Show file tree

Hide file tree

Showing 12 changed files with 249 additions and 113 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -38,8 +38,9 @@ inherits = "dev"
 opt-level = 2
 
 [workspace.dependencies]
-deep_space = {version = "2.24", features = ["althea"], default-features=false}
-web30 = "1.2"
-clarity = "1.3"
+deep_space = {version = "2.27", features = ["althea"], default-features=false}
+web30 = "1.6"
+clarity = "1.5"
+num256 = "0.6"
 awc = {version = "3.2", default-features = false, features=["openssl", "compress-gzip", "compress-zstd"]}
-althea_proto = "0.7"
+althea_proto = "0.9"
diff --git a/althea_types/Cargo.toml b/althea_types/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 
 [dependencies]
 babel_monitor = { path = "../babel_monitor" }
-num256 = "0.5"
+num256 = {workspace = true}
 base64 = "0.13"
 serde_derive = "1.0"
 serde = "1.0"

diff --git a/auto_bridge/Cargo.toml b/auto_bridge/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 web30 = {workspace = true}
-num256 = "0.5"
+num256 = {workspace = true}
 clarity = {workspace = true}
 rand = "0.8"
 num = "0.4"

diff --git a/integration_tests/Cargo.toml b/integration_tests/Cargo.toml
@@ -32,7 +32,7 @@ deep_space = {workspace = true}
 clarity = {workspace = true}
 althea_proto = {workspace = true}
 futures = { version = "0.3", features = ["compat"] }
-num256 = "0.5"
+num256 = {workspace = true}
 num-traits="0.2"
 web30 = {workspace = true}
 lazy_static = "1.4"

diff --git a/integration_tests/src/utils.rs b/integration_tests/src/utils.rs
@@ -778,7 +778,7 @@ pub async fn vote_yes_with_retry(
     let res = res.unwrap();
     info!(
         "Voting yes on governance proposal costing {} gas",
-        res.gas_used
+        res.gas_used()
     );
 }
 
@@ -854,7 +854,7 @@ pub async fn execute_register_coin_proposal(
         )
         .await
         .unwrap();
-    info!("Gov proposal executed with {:?}", res.raw_log);
+    info!("Gov proposal executed with {:?}", res.raw_log());
 
     vote_yes_on_proposals(contact, keys, None).await;
     if wait {

diff --git a/rita_client/Cargo.toml b/rita_client/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 [dependencies]
 compressed_log = "0.5"
 num-traits = "0.2"
-num256 = "0.5"
+num256 = {workspace = true}
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"

diff --git a/rita_common/Cargo.toml b/rita_common/Cargo.toml
@@ -24,7 +24,7 @@ log = { version = "0.4", features = ["release_max_level_info"] }
 settings = { path = "../settings" }
 clarity = {workspace = true}
 futures = { version = "0.3", features = ["compat"] }
-num256 = "0.5"
+num256 = {workspace = true}
 num-traits = "0.2"
 bincode = "1.3"
 serde_cbor = "0.11"
@@ -37,8 +37,8 @@ actix-service = "2.0.2"
 web30 = {workspace = true}
 althea_types = { path = "../althea_types" }
 deep_space = {workspace = true}
-prost-types ="0.12"
-cosmos-sdk-proto-althea = {package = "cosmos-sdk-proto-althea", version = "0.16", features = ["ethermint"]} 
+prost-types ="0.13"
+cosmos-sdk-proto-althea = {package = "cosmos-sdk-proto-althea", version = "0.18", features = ["ethermint"]} 
 althea_proto = {workspace = true}
 crossbeam = "0.8"
 

diff --git a/rita_common/src/payment_controller/mod.rs b/rita_common/src/payment_controller/mod.rs
@@ -316,9 +316,9 @@ async fn make_althea_payment(
     // setup tx hash
     info!(
         "Making payment with txid {} that will be converted to hex",
-        transaction.txhash
+        transaction.txhash()
     );
-    let pmt = pmt.publish(Uint256::from_str_radix(&transaction.txhash, 16).unwrap());
+    let pmt = pmt.publish(Uint256::from_str_radix(&transaction.txhash(), 16).unwrap());
 
     let retry = send_make_payment_endpoints(
         pmt,

diff --git a/rita_exit/Cargo.toml b/rita_exit/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 [dependencies]
 # debug is used here to make sure exit logs remain accessible locally
 sodiumoxide = "0.2"
-num256 = "0.5"
+num256 = {workspace = true}
 rita_common = { path = "../rita_common" }
 rita_client_registration = { path = "../rita_client_registration" }
 althea_kernel_interface = { path = "../althea_kernel_interface" }

diff --git a/settings/Cargo.toml b/settings/Cargo.toml
@@ -9,7 +9,7 @@ althea_types = { path = "../althea_types"}
 babel_monitor = { path = "../babel_monitor"}
 althea_kernel_interface = { path = "../althea_kernel_interface" }
 auto-bridge = { path = "../auto_bridge" }
-num256 = "0.5"
+num256 = {workspace = true}
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"

diff --git a/test_runner/Cargo.toml b/test_runner/Cargo.toml
@@ -19,8 +19,8 @@ althea_types = { path = "../althea_types" }
 althea_kernel_interface = { path = "../althea_kernel_interface" }
 deep_space = { version = "2", features = ["althea"] }
 rita_client_registration = { path = "../rita_client_registration" }
-web30 = "1.0"
-clarity = "1.2"
+web30 = {workspace = true}
+clarity = {workspace = true}
 
 [dev-dependencies]
 actix = "0.13"