*: Bump to v0.0.400

Signed-off-by: Dan Sover <[email protected]>

Author: exdx

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "avalanche-types"
-version = "0.0.397" # https://crates.io/crates/avalanche-types
+version = "0.0.400" # https://crates.io/crates/avalanche-types
 edition = "2021"
-rust-version = "1.69" # use "rustup override set stable" to overwrite current toolchain
+rust-version = "1.70" # use "rustup override set stable" to overwrite current toolchain
 publish = true
 description = "Avalanche primitive types in Rust"
 license = "BSD-3-Clause"
@@ -20,9 +20,10 @@ cert-manager = "0.0.10" # https://github.com/gyuho/cert-manager
 chrono = "0.4.24"
 cmp-manager = "0.0.1"
 ecdsa = { version = "0.16.7", features = ["rfc6979", "verifying"] } # https://github.com/RustCrypto/elliptic-curves/tree/master/k256
-ethers-core = { version = "=2.0.6", features = ["eip712"] } # https://github.com/gakonst/ethers-rs/releases
+ethers-core = { version = "=2.0.7", features = ["eip712"] } # https://github.com/gakonst/ethers-rs/releases
 hex = "0.4.3"
 hmac = "0.12.1"
+hyper = { version = "0.14.26"}
 k256 = { version = "0.13.1", features = ["ecdsa"] } # https://github.com/RustCrypto/elliptic-curves/tree/master/k256
 lazy_static = "1.4.0"
 log = "0.4.17"
@@ -31,14 +32,15 @@ primitive-types = { version = "0.12.1", features = ["impl-serde"] } # https://cr
 rand = "0.8.5"
 ring = "0.16.20"
 ripemd = "0.1.3"
-rust-embed = "6.6.1" # https://github.com/pyrossh/rust-embed
-serde = { version = "1.0.163", features = ["derive"] } # https://github.com/serde-rs/serde/releases
+rust-embed = "6.8.1" # https://github.com/pyrossh/rust-embed
+serde = { version = "1.0.166", features = ["derive"] } # https://github.com/serde-rs/serde/releases
 serde_json = "1.0.96" # https://github.com/serde-rs/json/releases
 serde_with = { version = "3.0.0", features = ["hex"] }
 serde_yaml = "0.9.21" # https://github.com/dtolnay/serde-yaml/releases
 sha2 = "0.10.6"
 sha3 = "0.10.8" # https://github.com/RustCrypto/hashes
 spki = "0.7.2" # https://github.com/RustCrypto/formats/tree/master/spki
+strum = "0.24.1"
 thiserror = "1.0.40"
 url = "2.3.1" # for "codec::serde::ip_port", "utils"
 zerocopy = "0.6.1"
@@ -48,7 +50,7 @@ zeroize = "1.6.0" # for "BLS
 secp256k1 = { version = "0.27.0", features = ["global-context", "rand-std", "recovery"], optional = true } # https://crates.io/crates/secp256k1
 
 # [OPTIONAL] for "kms_aws"
-aws-manager = { version = "0.28.26", features = ["kms"], optional = true } # https://github.com/gyuho/aws-manager/tags
+aws-manager = { version = "0.28.67", features = ["kms"], optional = true } # https://github.com/gyuho/aws-manager/tags
 aws-sdk-kms = { version = "0.28.0", optional = true } # https://crates.io/crates/aws-sdk-kms/versions
 
 # [OPTIONAL] for "message"
@@ -60,20 +62,19 @@ rand_core = { version = "0.6.4", features = ["std"], optional = true }
 
 # [OPTIONAL] for "evm", "jsonrpc_client"
 reqwest = { version = "0.11.18", optional = true } # https://github.com/seanmonstar/reqwest/releases
-tokio = { version = "1.28.1", features = ["full"], optional = true } # https://github.com/tokio-rs/tokio/releases
+tokio = { version = "1.29.1", features = ["full"], optional = true } # https://github.com/tokio-rs/tokio/releases
 
 # [OPTIONAL] for "evm"
 rlp = { version = "0.5.2", default-features = false, features = ["std"], optional = true }
 
 # [OPTIONAL] for "wallet_evm"
-ethers = { version = "=2.0.6", features = ["eip712"], optional = true } # https://github.com/gakonst/ethers-rs/releases
-ethers-providers = { version = "=2.0.6", optional = true } # https://github.com/gakonst/ethers-rs/releases
-ethers-signers = { version = "=2.0.6", optional = true } # https://github.com/gakonst/ethers-rs/releases
+ethers = { version = "=2.0.7", features = ["eip712"], optional = true } # https://github.com/gakonst/ethers-rs/releases
+ethers-providers = { version = "=2.0.7", optional = true } # https://github.com/gakonst/ethers-rs/releases
+ethers-signers = { version = "=2.0.7", optional = true } # https://github.com/gakonst/ethers-rs/releases
 
 # [OPTIONAL] for "subnet"
 futures = { version = "0.3.28", optional = true }
 http = { version = "0.2.9", optional = true }
-hyper = { version = "0.14.26", optional = true }
 jsonrpc-core = { version = "18.0.0", optional = true }
 jsonrpc-http-server = { version = "18.0.0", optional = true }
 num-derive = { version = "0.3.3", optional = true }
@@ -94,8 +95,8 @@ base64 = { version = "0.21.2", optional = true } # https://github.com/marshallpi
 num-bigint = { version = "0.4.3", optional = true }
 
 [build-dependencies]
-protoc-gen-prost = "0.2.2"
-protoc-gen-tonic = "0.2.2"
+protoc-gen-prost = "0.2.3"
+protoc-gen-tonic = "0.3.0"
 
 [dev-dependencies]
 env_logger = "0.10.0"
@@ -154,7 +155,6 @@ message = [
 subnet = [
     "futures",
     "http",
-    "hyper",
     "jsonrpc-core",
     "num-derive",
     "num-traits",

src/avalanchego/aliases.rs

@@ -0,0 +1,18 @@
+//! Chain alias functionality for the avalanchego node.
+use std::collections::HashMap;
+
+/// A map from blockchainIDs to custom aliases
+/// ref. <https://docs.avax.network/nodes/maintain/avalanchego-config-flags#--chain-aliases-file-string>.
+pub type Aliases = HashMap<String, Vec<String>>;
+
+#[test]
+fn test_aliases_json() {
+    let json = r#"{"q2aTwKuyzgs8pynF7UXBZCU7DejbZbZ6EUyHr3JQzYgwNPUPi": ["DFK"]}"#;
+    let aliases: Aliases = serde_json::from_str(json).unwrap();
+    assert_eq!(
+        aliases
+            .get("q2aTwKuyzgs8pynF7UXBZCU7DejbZbZ6EUyHr3JQzYgwNPUPi")
+            .unwrap(),
+        &vec!["DFK".to_string()]
+    )
+}

src/avalanchego/config.rs

@@ -84,7 +84,7 @@ pub struct Config {
     pub public_ip: Option<String>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub staking_enabled: Option<bool>,
+    pub sybil_protection_enabled: Option<bool>,
     /// Staking port.
     #[serde(default)]
     pub staking_port: u32,
@@ -208,7 +208,7 @@ pub struct Config {
     pub snow_mixed_query_num_push_vdr: Option<u64>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub consensus_gossip_frequency: Option<i64>,
+    pub consensus_accepted_frontier_gossip_frequency: Option<i64>,
     /// ref. <https://github.com/ava-labs/avalanchego/pull/1322>
     #[serde(skip_serializing_if = "Option::is_none")]
     pub consensus_app_concurrency: Option<i64>,
@@ -247,6 +247,9 @@ pub const DEFAULT_CONFIG_FILE_PATH: &str = "/data/avalanche-configs/config.json"
 /// Default "genesis" path on the remote linux machines.
 /// MUST BE a valid path in remote host machine.
 pub const DEFAULT_GENESIS_PATH: &str = "/data/avalanche-configs/genesis.json";
+/// Default "chain aliases" path on the remote linux machine.
+/// MUST BE a valid path in remote host machine.
+pub const DEFAULT_CHAIN_ALIASES_PATH: &str = "/data/avalanche-configs/chains/aliases.json";
 
 pub const DEFAULT_DB_TYPE: &str = "leveldb";
 /// Default "db-dir" directory path for remote linux machines.
@@ -277,7 +280,7 @@ pub const DEFAULT_HTTP_PORT: u32 = 9650;
 pub const DEFAULT_HTTP_HOST: &str = "0.0.0.0";
 pub const DEFAULT_HTTP_TLS_ENABLED: bool = false;
 
-pub const DEFAULT_STAKING_ENABLED: bool = true;
+pub const DEFAULT_SYBIL_PROTECTION_ENABLED: bool = true;
 /// Default staking port.
 /// NOTE: keep default value in sync with "avalanchego/config/flags.go".
 pub const DEFAULT_STAKING_PORT: u32 = 9651;
@@ -374,7 +377,7 @@ impl Config {
             http_tls_cert_file: None,
             public_ip: None,
 
-            staking_enabled: Some(DEFAULT_STAKING_ENABLED),
+            sybil_protection_enabled: Some(DEFAULT_SYBIL_PROTECTION_ENABLED),
             staking_port: DEFAULT_STAKING_PORT,
             staking_tls_key_file: Some(String::from(DEFAULT_STAKING_TLS_KEY_FILE)),
             staking_tls_cert_file: Some(String::from(DEFAULT_STAKING_TLS_CERT_FILE)),
@@ -436,7 +439,7 @@ impl Config {
 
             snow_mixed_query_num_push_vdr: Some(10),
 
-            consensus_gossip_frequency: Some(10000000000), // 10-second
+            consensus_accepted_frontier_gossip_frequency: Some(10000000000), // 10-second
             consensus_app_concurrency: Some(2),
 
             consensus_on_accept_gossip_validator_size: Some(0),
@@ -632,10 +635,10 @@ impl Config {
         }
 
         // staking
-        if self.staking_enabled.is_some() && !self.staking_enabled.unwrap() {
+        if self.sybil_protection_enabled.is_some() && !self.sybil_protection_enabled.unwrap() {
             return Err(Error::new(
                 ErrorKind::InvalidInput,
-                "'staking-enabled' must be true",
+                "'sybil_protection_enabled' must be true",
             ));
         }
         if self.staking_tls_cert_file.is_none() {

src/avalanchego/mod.rs

@@ -1,2 +1,3 @@
+pub mod aliases;
 pub mod config;
 pub mod genesis;

src/jsonrpc/client/admin.rs

@@ -5,6 +5,7 @@ use reqwest::{header::CONTENT_TYPE, ClientBuilder};
 use crate::{
     errors::{Error, Result},
     jsonrpc::admin::{ChainAliasParams, ChainAliasRequest, ChainAliasResponse},
+    jsonrpc::client::url,
     utils,
 };
 
@@ -22,11 +23,7 @@ pub async fn alias_chain(
             }
         })?;
 
-    let url = match (scheme, port) {
-        (Some(scheme), Some(port)) => format!("{scheme}://{host}:{port}/ext/admin"),
-        (Some(scheme), _) => format!("{scheme}://{host}/ext/admin"),
-        _ => format!("http://{host}/ext/admin"),
-    };
+    let url = url::try_create_url(url::Path::Admin, scheme.as_deref(), host.as_str(), port)?;
     log::info!("getting network name for {url}");
 
     let data = ChainAliasRequest {
@@ -54,7 +51,7 @@ pub async fn alias_chain(
         })?;
 
     let resp = req_cli_builder
-        .post(&url)
+        .post(url.to_string())
         .header(CONTENT_TYPE, "application/json")
         .body(d)
         .send()

src/jsonrpc/client/health.rs

@@ -2,21 +2,27 @@ use std::{sync::Arc, time::Duration};
 
 use crate::{
     errors::{Error, Result},
+    jsonrpc::client::url,
     jsonrpc::health,
+    utils::urls::extract_scheme_host_port_path_chain_alias,
 };
 use reqwest::ClientBuilder;
 
 /// "If a single piece of data must be accessible from more than one task
 /// concurrently, then it must be shared using synchronization primitives such as Arc."
 /// ref. <https://tokio.rs/tokio/tutorial/spawning>
 pub async fn check(http_rpc: Arc<String>, liveness: bool) -> Result<health::Response> {
-    let url_path = {
-        if liveness {
-            "ext/health/liveness"
-        } else {
-            "ext/health"
-        }
-    };
+    let (scheme, host, port, _, _) =
+        extract_scheme_host_port_path_chain_alias(&http_rpc).map_err(|e| Error::Other {
+            message: format!("failed extract_scheme_host_port_path_chain_alias '{}'", e),
+            retryable: false,
+        })?;
+
+    let mut url = url::try_create_url(url::Path::Health, scheme.as_deref(), host.as_str(), port)?;
+    if liveness {
+        url = url::try_create_url(url::Path::Liveness, scheme.as_deref(), host.as_str(), port)?;
+    }
+    log::info!("getting network name for {url}");
 
     let req_cli_builder = ClientBuilder::new()
         .user_agent(env!("CARGO_PKG_NAME"))
@@ -32,7 +38,7 @@ pub async fn check(http_rpc: Arc<String>, liveness: bool) -> Result<health::Resp
             }
         })?;
     let resp = req_cli_builder
-        .get(format!("{}/{}", http_rpc, url_path).as_str())
+        .get(url.to_string())
         .send()
         .await
         .map_err(|e|