diff --git a/Cargo.lock b/Cargo.lock index a0bdd2c..a96d620 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -175,7 +175,7 @@ dependencies = [ [[package]] name = "ash_cli" -version = "0.4.5" +version = "0.4.6-rc1" dependencies = [ "ash_sdk", "async-std", @@ -204,7 +204,7 @@ dependencies = [ [[package]] name = "ash_sdk" -version = "0.4.5" +version = "0.4.6-rc1" dependencies = [ "ash_api", "async-std", @@ -514,9 +514,8 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "avalanche-types" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8bac25ddf8cadad145564d8bab106b22fd85531507ec3e033a4c4c28bf5023b" +version = "0.1.2-fix" +source = "git+https://github.com/AshAvalanche/avalanche-rs.git?branch=avalanche-types-v0.1.2-fix#6686900f976736d7e3a497ddcfb4b6a6cb61fc22" dependencies = [ "async-trait", "bech32", diff --git a/Cargo.toml b/Cargo.toml index a4d6c3e..5b8c5e9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ members = ["crates/ash_cli", "crates/ash_sdk"] resolver = "2" [workspace.package] -version = "0.4.5" +version = "0.4.6-rc1" edition = "2021" authors = ["E36 Knots"] homepage = "https://ash.center" diff --git a/crates/ash_cli/Cargo.toml b/crates/ash_cli/Cargo.toml index 7ba3511..96197c6 100644 --- a/crates/ash_cli/Cargo.toml +++ b/crates/ash_cli/Cargo.toml @@ -15,7 +15,7 @@ categories.workspace = true keywords.workspace = true [dependencies] -ash_sdk = { path = "../ash_sdk", version = "0.4.5" } +ash_sdk = { path = "../ash_sdk", version = "0.4.6-rc1" } clap = { version = "4.0.32", features = ["derive", "env", "cargo", "string"] } colored = "2.0.0" exitcode = "1.1.2" diff --git a/crates/ash_cli/src/utils/templating.rs b/crates/ash_cli/src/utils/templating.rs index 16eae32..58732c1 100644 --- a/crates/ash_cli/src/utils/templating.rs +++ b/crates/ash_cli/src/utils/templating.rs @@ -159,7 +159,6 @@ pub(crate) fn template_validator_info( let elastic_subnet_info = &formatdoc!( " - Connected: {} Signer (BLS): Public key: {} PoP: {} @@ -177,7 +176,6 @@ pub(crate) fn template_validator_info( Locktime: {} Threshold: {} Addresses: {}", - type_colorize(&validator.connected), type_colorize(&match validator.signer { Some(ref signer) => format!("0x{}", hex::encode(signer.public_key.clone())), None => String::from("None"), diff --git a/crates/ash_sdk/Cargo.toml b/crates/ash_sdk/Cargo.toml index 7802927..cb1a018 100644 --- a/crates/ash_sdk/Cargo.toml +++ b/crates/ash_sdk/Cargo.toml @@ -15,11 +15,11 @@ categories.workspace = true keywords.workspace = true [dependencies] -avalanche-types = { version = "0.1.2", features = [ +avalanche-types = { version = "0.1.2-fix", features = [ "jsonrpc_client", "wallet", "subnet_evm", -] } +], git = "https://github.com/AshAvalanche/avalanche-rs.git", branch = "avalanche-types-v0.1.2-fix" } config = { version = "0.13.3", features = ["yaml"] } ethers = { version = "2.0.7", features = ["rustls"] } hex = { version = "0.4.3", features = ["serde"] } diff --git a/crates/ash_sdk/src/avalanche/jsonrpc/platformvm.rs b/crates/ash_sdk/src/avalanche/jsonrpc/platformvm.rs index 54f3170..cc88b12 100644 --- a/crates/ash_sdk/src/avalanche/jsonrpc/platformvm.rs +++ b/crates/ash_sdk/src/avalanche/jsonrpc/platformvm.rs @@ -193,8 +193,6 @@ mod tests { .find(|validator| validator.node_id == NodeId::from_str(AVAX_FUJI_NODE_ID).unwrap()) .unwrap(); - // Test that the node is connected - assert!(ava_labs_node.connected); // Test that the node has a non-zero uptime assert!(ava_labs_node.uptime > Some(0.0)); // Test that the node has a non-zero weight diff --git a/crates/ash_sdk/src/avalanche/subnets.rs b/crates/ash_sdk/src/avalanche/subnets.rs index 893ef0c..fcedc9f 100644 --- a/crates/ash_sdk/src/avalanche/subnets.rs +++ b/crates/ash_sdk/src/avalanche/subnets.rs @@ -362,7 +362,6 @@ pub struct AvalancheSubnetValidator { pub weight: Option, #[serde(skip_serializing_if = "Option::is_none")] pub potential_reward: Option, - pub connected: bool, #[serde(skip_serializing_if = "Option::is_none")] pub signer: Option, #[serde(skip_serializing_if = "Option::is_none")] @@ -392,7 +391,6 @@ impl AvalancheSubnetValidator { stake_amount: validator.stake_amount, weight: validator.weight, potential_reward: validator.potential_reward, - connected: validator.connected, signer: validator.signer.clone(), uptime: validator.uptime, validation_reward_owner: validator