diff --git a/Cargo.lock b/Cargo.lock index 761bb18e81..337e26c8ab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -135,7 +135,7 @@ dependencies = [ "log", "mime", "percent-encoding", - "pin-project 1.0.1", + "pin-project 1.0.2", "rand 0.7.3", "regex", "serde", @@ -143,7 +143,7 @@ dependencies = [ "serde_urlencoded", "sha-1", "slab", - "time 0.2.22", + "time 0.2.23", ] [[package]] @@ -310,14 +310,14 @@ dependencies = [ "log", "mime", "openssl", - "pin-project 1.0.1", + "pin-project 1.0.2", "regex", "rustls", "serde", "serde_json", "serde_urlencoded", "socket2", - "time 0.2.22", + "time 0.2.23", "tinyvec", "url", ] @@ -860,7 +860,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "784ad0fbab4f3e9cef09f20e0aea6000ae08d2cb98ac4c0abc53df18803d702f" dependencies = [ "percent-encoding", - "time 0.2.22", + "time 0.2.23", "version_check 0.9.2", ] @@ -1499,7 +1499,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project 1.0.1", + "pin-project 1.0.2", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -1682,7 +1682,7 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project 1.0.1", + "pin-project 1.0.2", "socket2", "tokio", "tower-service", @@ -1722,7 +1722,7 @@ dependencies = [ [[package]] name = "ic-agent" version = "0.1.0" -source = "git+https://github.com/dfinity/agent-rs.git?branch=next#132d7995435aeaf8011ee02c0b4009c292c5c2cd" +source = "git+https://github.com/dfinity/agent-rs.git?branch=next#6c02ef4bf25d82652ceb60c93b9df1a8863f0524" dependencies = [ "async-trait", "base32", @@ -1732,6 +1732,7 @@ dependencies = [ "hex", "ic-types", "leb128", + "mime", "openssl", "pem 0.8.1", "rand 0.7.3", @@ -1749,7 +1750,7 @@ dependencies = [ [[package]] name = "ic-types" version = "0.1.2" -source = "git+https://github.com/dfinity/agent-rs.git?branch=next#132d7995435aeaf8011ee02c0b4009c292c5c2cd" +source = "git+https://github.com/dfinity/agent-rs.git?branch=next#6c02ef4bf25d82652ceb60c93b9df1a8863f0524" dependencies = [ "base32", "crc32fast", @@ -1761,7 +1762,7 @@ dependencies = [ [[package]] name = "ic-utils" version = "0.1.0" -source = "git+https://github.com/dfinity/agent-rs.git?branch=next#132d7995435aeaf8011ee02c0b4009c292c5c2cd" +source = "git+https://github.com/dfinity/agent-rs.git?branch=next#6c02ef4bf25d82652ceb60c93b9df1a8863f0524" dependencies = [ "async-trait", "candid", @@ -1956,9 +1957,9 @@ checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" [[package]] name = "lock_api" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28247cc5a5be2f05fbcd76dd0cf2c7d3b5400cb978a28042abcd4fa0b3f8261c" +checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" dependencies = [ "scopeguard", ] @@ -2347,9 +2348,9 @@ checksum = "afb2e1c3ee07430c2cf76151675e583e0f19985fa6efae47d6848a3e2c824f85" [[package]] name = "parking_lot" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4893845fa2ca272e647da5d0e46660a314ead9c2fdd9a883aabc32e481a8733" +checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" dependencies = [ "instant", "lock_api", @@ -2435,11 +2436,11 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee41d838744f60d959d7074e3afb6b35c7456d0f61cad38a24e35e6553f73841" +checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7" dependencies = [ - "pin-project-internal 1.0.1", + "pin-project-internal 1.0.2", ] [[package]] @@ -2455,9 +2456,9 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81a4ffa594b66bff340084d4081df649a7dc049ac8d7fc458d8e628bfbbb2f86" +checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f" dependencies = [ "proc-macro2", "quote", @@ -2889,9 +2890,9 @@ dependencies = [ [[package]] name = "resolv-conf" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11834e137f3b14e309437a8276714eed3a80d1ef894869e510f2c0c0b98b9f4a" +checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" dependencies = [ "hostname", "quick-error", @@ -2899,9 +2900,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.16.15" +version = "0.16.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "952cd6b98c85bbc30efa1ba5783b8abf12fec8b3287ffa52605b9432313e34e4" +checksum = "b72b84d47e8ec5a4f2872e8262b8f8256c5be1c938a7d6d3a867a3ba8f722f74" dependencies = [ "cc", "libc", @@ -3226,9 +3227,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.4.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252" +checksum = "7acad6f34eb9e8a259d3283d1e8c1d34d7415943d4895f65cc73813c7396fc85" [[package]] name = "socket2" @@ -3250,9 +3251,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "standback" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4e0831040d2cf2bdfd51b844be71885783d489898a192f254ae25d57cce725c" +checksum = "cf906c8b8fc3f6ecd1046e01da1d8ddec83e48c8b08b84dcc02b585a6bedf5a8" dependencies = [ "version_check 0.9.2", ] @@ -3410,18 +3411,18 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" +checksum = "bf11676eb135389f21fcda654382c4859bbfc1d2f36e4425a2f829bb41b1e20e" dependencies = [ "winapi-util", ] [[package]] name = "terminal_size" -version = "0.1.13" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a14cd9f8c72704232f0bfc8455c0e861f0ad4eb60cc9ec8a170e231414c1e13" +checksum = "4bd2d183bd3fac5f5fe38ddbeb4dc9aec4a39a9d7d59e7491d900302da01cbe1" dependencies = [ "libc", "winapi 0.3.9", @@ -3496,9 +3497,9 @@ dependencies = [ [[package]] name = "time" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55b7151c9065e80917fbf285d9a5d1432f60db41d170ccafc749a136b41a93af" +checksum = "bcdaeea317915d59b2b4cd3b5efcd156c309108664277793f5351700c02ce98b" dependencies = [ "const_fn", "libc", @@ -3670,9 +3671,9 @@ checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" [[package]] name = "trust-dns-proto" -version = "0.19.5" +version = "0.19.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdd7061ba6f4d4d9721afedffbfd403f20f39a4301fee1b70d6fcd09cca69f28" +checksum = "53861fcb288a166aae4c508ae558ed18b53838db728d4d310aad08270a7d4c2b" dependencies = [ "async-trait", "backtrace", @@ -3690,9 +3691,9 @@ dependencies = [ [[package]] name = "trust-dns-resolver" -version = "0.19.5" +version = "0.19.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f23cdfdc3d8300b3c50c9e84302d3bd6d860fb9529af84ace6cf9665f181b77" +checksum = "6759e8efc40465547b0dfce9500d733c65f969a4cbbfbe3ccf68daaa46ef179e" dependencies = [ "backtrace", "cfg-if 0.1.10", @@ -3746,18 +3747,18 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f98e67a4d84f730d343392f9bfff7d21e3fca562b9cb7a43b768350beeddc6" +checksum = "f1e9a0b71dba18b6fa17c7b3dcf1440bb3522552deb2f84bf47dabd9fb7e5570" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" +checksum = "db8716a166f290ff49dabc18b44aa407cb7c6dbe1aa0971b44b8a24b0ca35aae" [[package]] name = "unicode-width" diff --git a/Cargo.toml b/Cargo.toml index d7649e59e3..19e9312853 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,16 +7,16 @@ members = [ version = "0.1.0" git = "https://github.com/dfinity/agent-rs.git" branch = "next" -rev = "dd99c5c1d7f2ade92451d21eb20fccca59237b84" +rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524" [patch.crates-io.ic-types] version = "0.1.2" git = "https://github.com/dfinity/agent-rs.git" branch = "next" -rev = "dd99c5c1d7f2ade92451d21eb20fccca59237b84" +rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524" [patch.crates-io.ic-utils] version = "0.1.0" git = "https://github.com/dfinity/agent-rs.git" branch = "next" -rev = "dd99c5c1d7f2ade92451d21eb20fccca59237b84" +rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524" diff --git a/nix/sources.json b/nix/sources.json index 44a3fb9edf..ebb783645a 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -44,9 +44,9 @@ "type": "git" }, "ic-ref": { - "branch": "release-0.11", + "branch": "release-0.13", "repo": "ssh://git@github.com/dfinity-lab/ic-ref", - "rev": "9edd0fdda006519118ed40515b84c74f69c59bc1", + "rev": "d08472d437c95534ee3d09e635a370522ea0fd37", "type": "git" }, "motoko": { diff --git a/src/dfx/Cargo.toml b/src/dfx/Cargo.toml index 0f84899551..c0dbcfd2cd 100644 --- a/src/dfx/Cargo.toml +++ b/src/dfx/Cargo.toml @@ -71,19 +71,19 @@ wasmparser = "0.45.0" version = "0.1.0" git = "https://github.com/dfinity/agent-rs.git" branch = "next" -rev = "dd99c5c1d7f2ade92451d21eb20fccca59237b84" +rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524" [dependencies.ic-types] version = "0.1.2" git = "https://github.com/dfinity/agent-rs.git" branch = "next" -rev = "dd99c5c1d7f2ade92451d21eb20fccca59237b84" +rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524" [dependencies.ic-utils] version = "0.1.0" git = "https://github.com/dfinity/agent-rs.git" branch = "next" -rev = "dd99c5c1d7f2ade92451d21eb20fccca59237b84" +rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524" [dev-dependencies] env_logger = "0.6" diff --git a/src/dfx/src/lib/error/mod.rs b/src/dfx/src/lib/error/mod.rs index 578d78ad46..fd0a26786a 100644 --- a/src/dfx/src/lib/error/mod.rs +++ b/src/dfx/src/lib/error/mod.rs @@ -194,19 +194,8 @@ impl Display for DfxError { reject_code, reject_message ))?; } - DfxError::AgentError(AgentError::HttpError { - status, - content_type, - content, - }) if is_plain_text_utf8(content_type) => { - f.write_fmt(format_args!( - "Replica error (HTTP status {}): {}", - status, - String::from_utf8(content.to_vec()).unwrap_or_else(|from_utf8_err| format!( - "(unable to decode content: {:#?})", - from_utf8_err - )) - ))?; + DfxError::AgentError(AgentError::HttpError(http_error_payload)) => { + f.write_fmt(format_args!("Replica error: {}", http_error_payload))?; } DfxError::Unknown(err) => { f.write_fmt(format_args!("Unknown error: {}", err))?; @@ -341,12 +330,3 @@ impl From for DfxError { DfxError::WaiterError(err) } } - -fn is_plain_text_utf8(content_type: &Option) -> bool { - // text/plain is also sometimes returned by the replica (or ic-ref), - // depending on where in the stack the error happens. - matches!( - content_type.as_ref().and_then(|s|s.parse::().ok()), - Some(mt) if mt == mime::TEXT_PLAIN || mt == mime::TEXT_PLAIN_UTF_8 - ) -}