Update avalanche-types

Author: richardpringle

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "avalanche-types"
-version = "0.0.394" # https://crates.io/crates/avalanche-types
+version = "0.0.396" # https://crates.io/crates/avalanche-types
 edition = "2021"
 rust-version = "1.69" # use "rustup override set stable" to overwrite current toolchain
 publish = true
@@ -20,7 +20,7 @@ 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.4", features = ["eip712"] } # https://github.com/gakonst/ethers-rs/releases
+ethers-core = { version = "=2.0.6", features = ["eip712"] } # https://github.com/gakonst/ethers-rs/releases
 hex = "0.4.3"
 hmac = "0.12.1"
 k256 = { version = "0.13.1", features = ["ecdsa"] } # https://github.com/RustCrypto/elliptic-curves/tree/master/k256
@@ -48,7 +48,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.0", features = ["kms"], optional = true } # https://github.com/gyuho/aws-manager/tags
+aws-manager = { version = "0.28.1", 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"
@@ -66,9 +66,9 @@ tokio = { version = "1.28.1", features = ["full"], optional = true } # https://g
 rlp = { version = "0.5.2", default-features = false, features = ["std"], optional = true }
 
 # [OPTIONAL] for "wallet_evm"
-ethers = { version = "=2.0.4", features = ["eip712"], optional = true } # https://github.com/gakonst/ethers-rs/releases
-ethers-providers = { version = "=2.0.4", optional = true } # https://github.com/gakonst/ethers-rs/releases
-ethers-signers = { version = "=2.0.4", optional = true } # https://github.com/gakonst/ethers-rs/releases
+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
 
 # [OPTIONAL] for "subnet"
 futures = { version = "0.3.28", optional = true }
@@ -90,7 +90,7 @@ tower-service = { version = "0.3.2", optional = true }
 prometheus = { version = "0.13.3", default-features = false, features = ["process"], optional = true }
 
 # [OPTIONAL] for "codec"
-base64 = { version = "0.21.1", optional = true } # https://github.com/marshallpierce/rust-base64
+base64 = { version = "0.21.2", optional = true } # https://github.com/marshallpierce/rust-base64
 num-bigint = { version = "0.4.3", optional = true }
 
 [build-dependencies]
@@ -107,7 +107,8 @@ tokio-test = "0.4.2"
 
 # Add optional features to docs.
 [package.metadata.docs.rs]
-features = ["subnet", "subnet_metrics"]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
 
 [features]
 default = [

README.md

@@ -13,7 +13,8 @@
 | v0.0.201-271     | v1.9.6,v1.9.7          | 22               |
 | v0.0.272-291     | v1.9.8,v1.9.9          | 23               |
 | v0.0.292-335     | v1.9.10,v1.9.16        | 24               |
-| v0.0.336+        | v1.10.0                | 25               |
+| v0.0.336-390     | v1.10.0                | 25               |
+| v0.0.391+        | v1.10.1+               | 26               |
 
 ## Introduction
 

scripts/examples.sh

@@ -6,7 +6,7 @@ if ! [[ "$0" =~ scripts/examples.sh ]]; then
   exit 255
 fi
 
-cargo run --example key_cert --features="cert" -- /tmp/test.insecure.key /tmp/test.insecure.cert
+cargo run --example key_cert -- /tmp/test.insecure.key /tmp/test.insecure.cert
 
 # cargo run --example key_secp256k1_kms_aws --features="kms_aws"
 

scripts/protobuf_codegen.sh

@@ -3,15 +3,15 @@
 # protocol version is the version of the gRPC proto definitions
 # as defined by the avalanchego rpcchainvm.
 # ref. https://github.com/ava-labs/avalanchego/blob/v1.9.11/version/constants.go#L15-L17
-PROTOCOL_VERSION='24'
+PROTOCOL_VERSION='26'
 
 if ! [[ "$0" =~ scripts/protobuf_codegen.sh ]]; then
   echo "must be run from repository root"
   exit 255
 fi
 
 # ref. https://docs.buf.build/installation
-BUF_VERSION='1.15.1'
+BUF_VERSION='1.19.0'
 if [[ $(buf --version | cut -f2 -d' ') != "${BUF_VERSION}" ]]; then
   echo "could not find buf ${BUF_VERSION}, is it installed + in PATH?"
   exit 255

src/jsonrpc/admin.rs

@@ -78,15 +78,15 @@ mod tests {
 
     #[test]
     fn test_deserialization() {
-        let resp = ChainAliasResponse {
+        let expected = ChainAliasResponse {
             jsonrpc: String::from(DEFAULT_VERSION),
             id: DEFAULT_ID,
         };
 
-        let expected = r#"{"jsonrpc": "2.0","id": 1,"result": {}}"#.as_bytes();
+        let response = r#"{"jsonrpc": "2.0","id": 1,"result": {}}"#.as_bytes();
         let deserialized: ChainAliasResponse =
-            serde_json::from_slice(expected).expect("failed deserialization");
+            serde_json::from_slice(response).expect("failed deserialization");
 
-        assert_eq!(resp, deserialized);
+        assert_eq!(expected, deserialized);
     }
 }

src/jsonrpc/client/admin.rs

@@ -22,16 +22,12 @@ pub async fn alias_chain(
             }
         })?;
 
-    let u = if let Some(scheme) = scheme {
-        if let Some(port) = port {
-            format!("{scheme}://{host}:{port}/ext/admin")
-        } else {
-            format!("{scheme}://{host}/ext/admin")
-        }
-    } else {
-        format!("http://{host}/ext/admin")
+    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"),
     };
-    log::info!("getting network name for {u}");
+    log::info!("getting network name for {url}");
 
     let data = ChainAliasRequest {
         params: Some(ChainAliasParams { chain, alias }),
@@ -58,7 +54,7 @@ pub async fn alias_chain(
         })?;
 
     let resp = req_cli_builder
-        .post(&u)
+        .post(&url)
         .header(CONTENT_TYPE, "application/json")
         .body(d)
         .send()
@@ -77,9 +73,8 @@ pub async fn alias_chain(
             retryable: false,
         }
     })?;
-    let out: Vec<u8> = out.into();
 
-    let response: ChainAliasResponse = serde_json::from_slice(&out)
+    let response: ChainAliasResponse = serde_json::from_slice(out.as_ref())
         .map_err(|e| Error::Other {
             message: format!("failed serde_json::from_slice '{}'", e),
             retryable: false,

src/message/accepted.rs

@@ -22,7 +22,6 @@ impl Message {
                 chain_id: prost::bytes::Bytes::new(),
                 request_id: 0,
                 container_ids: Vec::new(),
-                engine_type: p2p::EngineType::Unspecified.into(),
             },
             gzip_compress: false,
         }

src/message/accepted_frontier.rs

@@ -22,7 +22,6 @@ impl Message {
                 chain_id: prost::bytes::Bytes::new(),
                 request_id: 0,
                 container_ids: Vec::new(),
-                engine_type: p2p::EngineType::Unspecified.into(),
             },
             gzip_compress: false,
         }

src/message/ancestors.rs

@@ -22,7 +22,6 @@ impl Message {
                 chain_id: prost::bytes::Bytes::new(),
                 request_id: 0,
                 containers: Vec::new(),
-                engine_type: p2p::EngineType::Unspecified.into(),
             },
             gzip_compress: false,
         }

src/message/chits.rs

@@ -23,7 +23,6 @@ impl Message {
                 request_id: 0,
                 preferred_container_ids: Vec::new(),
                 accepted_container_ids: Vec::new(),
-                engine_type: p2p::EngineType::Unspecified.into(),
             },
             gzip_compress: false,
         }