From 8fa3a43faca49b2c6faa4fb4c808817bc7285c67 Mon Sep 17 00:00:00 2001 From: Eric Swanson Date: Mon, 9 Nov 2020 11:31:45 -0800 Subject: [PATCH 01/14] Update ic-ref and agent-rs --- Cargo.lock | 7 ++++--- Cargo.toml | 12 ++++++------ nix/sources.json | 4 ++-- src/dfx/Cargo.toml | 12 ++++++------ src/dfx/src/lib/error/mod.rs | 6 +++--- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 29984fdbec..d8209017b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1714,7 +1714,7 @@ dependencies = [ [[package]] name = "ic-agent" version = "0.1.0" -source = "git+https://github.com/dfinity/agent-rs.git?branch=next#dd99c5c1d7f2ade92451d21eb20fccca59237b84" +source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#ababe5a22ec4d18be5dcf785d5bb97b46e6dfaff" dependencies = [ "async-trait", "base32", @@ -1724,6 +1724,7 @@ dependencies = [ "hex", "ic-types", "leb128", + "mime", "openssl", "pem 0.8.1", "rand 0.7.3", @@ -1741,7 +1742,7 @@ dependencies = [ [[package]] name = "ic-types" version = "0.1.2" -source = "git+https://github.com/dfinity/agent-rs.git?branch=next#dd99c5c1d7f2ade92451d21eb20fccca59237b84" +source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#ababe5a22ec4d18be5dcf785d5bb97b46e6dfaff" dependencies = [ "base32", "crc32fast", @@ -1753,7 +1754,7 @@ dependencies = [ [[package]] name = "ic-utils" version = "0.1.0" -source = "git+https://github.com/dfinity/agent-rs.git?branch=next#dd99c5c1d7f2ade92451d21eb20fccca59237b84" +source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#ababe5a22ec4d18be5dcf785d5bb97b46e6dfaff" dependencies = [ "async-trait", "candid", diff --git a/Cargo.toml b/Cargo.toml index d7649e59e3..bfbf6d9ed3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,17 +6,17 @@ members = [ [patch.crates-io.ic-agent] version = "0.1.0" git = "https://github.com/dfinity/agent-rs.git" -branch = "next" -rev = "dd99c5c1d7f2ade92451d21eb20fccca59237b84" +branch = "es-1139-resp-auth-use-read-state" +rev = "ababe5a22ec4d18be5dcf785d5bb97b46e6dfaff" [patch.crates-io.ic-types] version = "0.1.2" git = "https://github.com/dfinity/agent-rs.git" -branch = "next" -rev = "dd99c5c1d7f2ade92451d21eb20fccca59237b84" +branch = "es-1139-resp-auth-use-read-state" +rev = "ababe5a22ec4d18be5dcf785d5bb97b46e6dfaff" [patch.crates-io.ic-utils] version = "0.1.0" git = "https://github.com/dfinity/agent-rs.git" -branch = "next" -rev = "dd99c5c1d7f2ade92451d21eb20fccca59237b84" +branch = "es-1139-resp-auth-use-read-state" +rev = "ababe5a22ec4d18be5dcf785d5bb97b46e6dfaff" diff --git a/nix/sources.json b/nix/sources.json index 26a0fae239..bbcd352dc2 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": "78576bc4533bb831c9331e092d321d51c07e7342", "type": "git" }, "motoko": { diff --git a/src/dfx/Cargo.toml b/src/dfx/Cargo.toml index ec8d1fdd8f..8a234172c8 100644 --- a/src/dfx/Cargo.toml +++ b/src/dfx/Cargo.toml @@ -70,20 +70,20 @@ wasmparser = "0.45.0" [dependencies.ic-agent] version = "0.1.0" git = "https://github.com/dfinity/agent-rs.git" -branch = "next" -rev = "dd99c5c1d7f2ade92451d21eb20fccca59237b84" +branch = "es-1139-resp-auth-use-read-state" +rev = "ababe5a22ec4d18be5dcf785d5bb97b46e6dfaff" [dependencies.ic-types] version = "0.1.2" git = "https://github.com/dfinity/agent-rs.git" -branch = "next" -rev = "dd99c5c1d7f2ade92451d21eb20fccca59237b84" +branch = "es-1139-resp-auth-use-read-state" +rev = "ababe5a22ec4d18be5dcf785d5bb97b46e6dfaff" [dependencies.ic-utils] version = "0.1.0" git = "https://github.com/dfinity/agent-rs.git" -branch = "next" -rev = "dd99c5c1d7f2ade92451d21eb20fccca59237b84" +branch = "es-1139-resp-auth-use-read-state" +rev = "ababe5a22ec4d18be5dcf785d5bb97b46e6dfaff" [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..04dd7c0d6e 100644 --- a/src/dfx/src/lib/error/mod.rs +++ b/src/dfx/src/lib/error/mod.rs @@ -1,4 +1,4 @@ -use ic_agent::AgentError; +use ic_agent::{AgentError, HttpErrorPayload}; use ic_types::principal::PrincipalError; mod build; @@ -194,11 +194,11 @@ impl Display for DfxError { reject_code, reject_message ))?; } - DfxError::AgentError(AgentError::HttpError { + DfxError::AgentError(AgentError::HttpError(HttpErrorPayload { status, content_type, content, - }) if is_plain_text_utf8(content_type) => { + })) if is_plain_text_utf8(content_type) => { f.write_fmt(format_args!( "Replica error (HTTP status {}): {}", status, From 2c746b155ac8cb087a90dc7c70f985e359235352 Mon Sep 17 00:00:00 2001 From: Eric Swanson Date: Tue, 10 Nov 2020 10:40:18 -0800 Subject: [PATCH 02/14] status not found in certificate indicates status unknown --- Cargo.lock | 10 +++++----- Cargo.toml | 9 ++++++--- src/dfx/Cargo.toml | 9 ++++++--- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d8209017b0..7b1582d12b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1714,7 +1714,7 @@ dependencies = [ [[package]] name = "ic-agent" version = "0.1.0" -source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#ababe5a22ec4d18be5dcf785d5bb97b46e6dfaff" +source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#e0d19327e7dd71c1678f5a74042f01a731bbd04f" dependencies = [ "async-trait", "base32", @@ -1742,7 +1742,7 @@ dependencies = [ [[package]] name = "ic-types" version = "0.1.2" -source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#ababe5a22ec4d18be5dcf785d5bb97b46e6dfaff" +source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#e0d19327e7dd71c1678f5a74042f01a731bbd04f" dependencies = [ "base32", "crc32fast", @@ -1754,7 +1754,7 @@ dependencies = [ [[package]] name = "ic-utils" version = "0.1.0" -source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#ababe5a22ec4d18be5dcf785d5bb97b46e6dfaff" +source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#e0d19327e7dd71c1678f5a74042f01a731bbd04f" dependencies = [ "async-trait", "candid", @@ -2146,9 +2146,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a1cda389c26d6b88f3d2dc38aa1b750fe87d298cc5d795ec9e975f402f00372" +checksum = "6fcc7939b5edc4e4f86b1b4a04bb1498afaaf871b1a6691838ed06fcb48d3a3f" dependencies = [ "lazy_static", "libc", diff --git a/Cargo.toml b/Cargo.toml index bfbf6d9ed3..4eeaf82bb3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,18 +5,21 @@ members = [ [patch.crates-io.ic-agent] version = "0.1.0" +#path = "../agent-rs/ic-agent" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "ababe5a22ec4d18be5dcf785d5bb97b46e6dfaff" +rev = "e0d19327e7dd71c1678f5a74042f01a731bbd04f" [patch.crates-io.ic-types] version = "0.1.2" +#path = "../agent-rs/ic-types" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "ababe5a22ec4d18be5dcf785d5bb97b46e6dfaff" +rev = "e0d19327e7dd71c1678f5a74042f01a731bbd04f" [patch.crates-io.ic-utils] version = "0.1.0" +#path = "../agent-rs/ic-utils" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "ababe5a22ec4d18be5dcf785d5bb97b46e6dfaff" +rev = "e0d19327e7dd71c1678f5a74042f01a731bbd04f" diff --git a/src/dfx/Cargo.toml b/src/dfx/Cargo.toml index 8a234172c8..2cc15c9862 100644 --- a/src/dfx/Cargo.toml +++ b/src/dfx/Cargo.toml @@ -69,21 +69,24 @@ wasmparser = "0.45.0" [dependencies.ic-agent] version = "0.1.0" +#path = "../../../agent-rs/ic-agent" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "ababe5a22ec4d18be5dcf785d5bb97b46e6dfaff" +rev = "e0d19327e7dd71c1678f5a74042f01a731bbd04f" [dependencies.ic-types] version = "0.1.2" +#path = "../../../agent-rs/ic-types" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "ababe5a22ec4d18be5dcf785d5bb97b46e6dfaff" +rev = "e0d19327e7dd71c1678f5a74042f01a731bbd04f" [dependencies.ic-utils] version = "0.1.0" +#path = "../../../agent-rs/ic-utils" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "ababe5a22ec4d18be5dcf785d5bb97b46e6dfaff" +rev = "e0d19327e7dd71c1678f5a74042f01a731bbd04f" [dev-dependencies] env_logger = "0.6" From d9c372ffe8d434f678d81c09c324e49bbb76a07b Mon Sep 17 00:00:00 2001 From: Eric Swanson Date: Tue, 10 Nov 2020 10:54:20 -0800 Subject: [PATCH 03/14] format --- src/dfx/src/lib/error/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dfx/src/lib/error/mod.rs b/src/dfx/src/lib/error/mod.rs index 04dd7c0d6e..719524a178 100644 --- a/src/dfx/src/lib/error/mod.rs +++ b/src/dfx/src/lib/error/mod.rs @@ -198,7 +198,7 @@ impl Display for DfxError { status, content_type, content, - })) if is_plain_text_utf8(content_type) => { + })) if is_plain_text_utf8(content_type) => { f.write_fmt(format_args!( "Replica error (HTTP status {}): {}", status, From d450fd01cf577fa1e96b41e99ebdd7fd9ef8d56a Mon Sep 17 00:00:00 2001 From: Eric Swanson Date: Tue, 10 Nov 2020 17:22:37 -0800 Subject: [PATCH 04/14] update agent / new HashTree type --- Cargo.lock | 10 +++++----- Cargo.toml | 6 +++--- src/dfx/Cargo.toml | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7b1582d12b..dde636e757 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1714,7 +1714,7 @@ dependencies = [ [[package]] name = "ic-agent" version = "0.1.0" -source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#e0d19327e7dd71c1678f5a74042f01a731bbd04f" +source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#4c5835098958f63df2650eb1af949468af7090f8" dependencies = [ "async-trait", "base32", @@ -1742,7 +1742,7 @@ dependencies = [ [[package]] name = "ic-types" version = "0.1.2" -source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#e0d19327e7dd71c1678f5a74042f01a731bbd04f" +source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#4c5835098958f63df2650eb1af949468af7090f8" dependencies = [ "base32", "crc32fast", @@ -1754,7 +1754,7 @@ dependencies = [ [[package]] name = "ic-utils" version = "0.1.0" -source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#e0d19327e7dd71c1678f5a74042f01a731bbd04f" +source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#4c5835098958f63df2650eb1af949468af7090f8" dependencies = [ "async-trait", "candid", @@ -2360,9 +2360,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba7ae1a2180ed02ddfdb5ab70c70d596a26dd642e097bb6fe78b1bde8588ed97" +checksum = "7151b083b0664ed58ed669fcdd92f01c3d2fdbf10af4931a301474950b52bfa9" [[package]] name = "pem" diff --git a/Cargo.toml b/Cargo.toml index 4eeaf82bb3..debf94b9fe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,18 +8,18 @@ version = "0.1.0" #path = "../agent-rs/ic-agent" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "e0d19327e7dd71c1678f5a74042f01a731bbd04f" +rev = "4c5835098958f63df2650eb1af949468af7090f8" [patch.crates-io.ic-types] version = "0.1.2" #path = "../agent-rs/ic-types" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "e0d19327e7dd71c1678f5a74042f01a731bbd04f" +rev = "4c5835098958f63df2650eb1af949468af7090f8" [patch.crates-io.ic-utils] version = "0.1.0" #path = "../agent-rs/ic-utils" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "e0d19327e7dd71c1678f5a74042f01a731bbd04f" +rev = "4c5835098958f63df2650eb1af949468af7090f8" diff --git a/src/dfx/Cargo.toml b/src/dfx/Cargo.toml index 2cc15c9862..d87e7ea963 100644 --- a/src/dfx/Cargo.toml +++ b/src/dfx/Cargo.toml @@ -72,21 +72,21 @@ version = "0.1.0" #path = "../../../agent-rs/ic-agent" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "e0d19327e7dd71c1678f5a74042f01a731bbd04f" +rev = "4c5835098958f63df2650eb1af949468af7090f8" [dependencies.ic-types] version = "0.1.2" #path = "../../../agent-rs/ic-types" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "e0d19327e7dd71c1678f5a74042f01a731bbd04f" +rev = "4c5835098958f63df2650eb1af949468af7090f8" [dependencies.ic-utils] version = "0.1.0" #path = "../../../agent-rs/ic-utils" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "e0d19327e7dd71c1678f5a74042f01a731bbd04f" +rev = "4c5835098958f63df2650eb1af949468af7090f8" [dev-dependencies] env_logger = "0.6" From cd5455915b6d2f796b90b4ffe0da67987d9ed922 Mon Sep 17 00:00:00 2001 From: Eric Swanson Date: Wed, 11 Nov 2020 12:21:40 -0800 Subject: [PATCH 05/14] Update ic-ref for improved DER detection --- nix/sources.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/sources.json b/nix/sources.json index 64d58a0965..27b53e3e81 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -46,7 +46,7 @@ "ic-ref": { "branch": "release-0.13", "repo": "ssh://git@github.com/dfinity-lab/ic-ref", - "rev": "78576bc4533bb831c9331e092d321d51c07e7342", + "rev": "96deb731a6544371150d477cf2ac20c22f34164c", "type": "git" }, "motoko": { From edfda6e17332f6308ea9418b8c2b99e22453baae Mon Sep 17 00:00:00 2001 From: Eric Swanson Date: Thu, 12 Nov 2020 12:01:14 -0800 Subject: [PATCH 06/14] update agent-rs --- Cargo.lock | 32 +++++++++++++------------------- Cargo.toml | 6 +++--- src/dfx/Cargo.toml | 6 +++--- 3 files changed, 19 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2119f64655..d0e80e5db0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -318,7 +318,7 @@ dependencies = [ "serde_urlencoded", "socket2", "time 0.2.22", - "tinyvec 1.0.1", + "tinyvec", "url", ] @@ -1714,7 +1714,7 @@ dependencies = [ [[package]] name = "ic-agent" version = "0.1.0" -source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#4c5835098958f63df2650eb1af949468af7090f8" +source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#abe5f6a68bd7b16ca6fed5124814ec828160296f" dependencies = [ "async-trait", "base32", @@ -1742,7 +1742,7 @@ dependencies = [ [[package]] name = "ic-types" version = "0.1.2" -source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#4c5835098958f63df2650eb1af949468af7090f8" +source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#abe5f6a68bd7b16ca6fed5124814ec828160296f" dependencies = [ "base32", "crc32fast", @@ -1754,7 +1754,7 @@ dependencies = [ [[package]] name = "ic-utils" version = "0.1.0" -source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#4c5835098958f63df2650eb1af949468af7090f8" +source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#abe5f6a68bd7b16ca6fed5124814ec828160296f" dependencies = [ "async-trait", "candid", @@ -2283,9 +2283,9 @@ checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" [[package]] name = "once_cell" -version = "1.4.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad" +checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" [[package]] name = "opaque-debug" @@ -3219,9 +3219,9 @@ checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252" [[package]] name = "socket2" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1fa70dc5c8104ec096f4fe7ede7a221d35ae13dcd19ba1ad9a81d2cab9a1c44" +checksum = "7fd8b795c389288baa5f355489c65e71fd48a02104600d15c4cfbc561e9e429d" dependencies = [ "cfg-if 0.1.10", "libc", @@ -3519,12 +3519,6 @@ dependencies = [ "syn", ] -[[package]] -name = "tinyvec" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117" - [[package]] name = "tinyvec" version = "1.0.1" @@ -3542,9 +3536,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd" +checksum = "a6d7ad61edd59bfcc7e80dababf0f4aed2e6d5e0ba1659356ae889752dfc12ff" dependencies = [ "bytes", "fnv", @@ -3739,11 +3733,11 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" +checksum = "b7f98e67a4d84f730d343392f9bfff7d21e3fca562b9cb7a43b768350beeddc6" dependencies = [ - "tinyvec 0.3.4", + "tinyvec", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index debf94b9fe..70c0ded02d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,18 +8,18 @@ version = "0.1.0" #path = "../agent-rs/ic-agent" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "4c5835098958f63df2650eb1af949468af7090f8" +rev = "abe5f6a68bd7b16ca6fed5124814ec828160296f" [patch.crates-io.ic-types] version = "0.1.2" #path = "../agent-rs/ic-types" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "4c5835098958f63df2650eb1af949468af7090f8" +rev = "abe5f6a68bd7b16ca6fed5124814ec828160296f" [patch.crates-io.ic-utils] version = "0.1.0" #path = "../agent-rs/ic-utils" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "4c5835098958f63df2650eb1af949468af7090f8" +rev = "abe5f6a68bd7b16ca6fed5124814ec828160296f" diff --git a/src/dfx/Cargo.toml b/src/dfx/Cargo.toml index b0c273b053..9843aeb6c7 100644 --- a/src/dfx/Cargo.toml +++ b/src/dfx/Cargo.toml @@ -72,21 +72,21 @@ version = "0.1.0" #path = "../../../agent-rs/ic-agent" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "4c5835098958f63df2650eb1af949468af7090f8" +rev = "abe5f6a68bd7b16ca6fed5124814ec828160296f" [dependencies.ic-types] version = "0.1.2" #path = "../../../agent-rs/ic-types" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "4c5835098958f63df2650eb1af949468af7090f8" +rev = "abe5f6a68bd7b16ca6fed5124814ec828160296f" [dependencies.ic-utils] version = "0.1.0" #path = "../../../agent-rs/ic-utils" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "4c5835098958f63df2650eb1af949468af7090f8" +rev = "abe5f6a68bd7b16ca6fed5124814ec828160296f" [dev-dependencies] env_logger = "0.6" From 2bb5755abacfe09febfa120f8345250e17d4f2bf Mon Sep 17 00:00:00 2001 From: Eric Swanson Date: Thu, 12 Nov 2020 12:52:16 -0800 Subject: [PATCH 07/14] Update rust agent; it now formats http payload --- Cargo.lock | 6 +++--- Cargo.toml | 6 +++--- src/dfx/Cargo.toml | 6 +++--- src/dfx/src/lib/error/mod.rs | 26 ++++---------------------- 4 files changed, 13 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d0e80e5db0..2b1dbc0296 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1714,7 +1714,7 @@ dependencies = [ [[package]] name = "ic-agent" version = "0.1.0" -source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#abe5f6a68bd7b16ca6fed5124814ec828160296f" +source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#5fc82783da41b253d629dbc55a72c23e7284b522" dependencies = [ "async-trait", "base32", @@ -1742,7 +1742,7 @@ dependencies = [ [[package]] name = "ic-types" version = "0.1.2" -source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#abe5f6a68bd7b16ca6fed5124814ec828160296f" +source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#5fc82783da41b253d629dbc55a72c23e7284b522" dependencies = [ "base32", "crc32fast", @@ -1754,7 +1754,7 @@ dependencies = [ [[package]] name = "ic-utils" version = "0.1.0" -source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#abe5f6a68bd7b16ca6fed5124814ec828160296f" +source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#5fc82783da41b253d629dbc55a72c23e7284b522" dependencies = [ "async-trait", "candid", diff --git a/Cargo.toml b/Cargo.toml index 70c0ded02d..8bd25c2956 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,18 +8,18 @@ version = "0.1.0" #path = "../agent-rs/ic-agent" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "abe5f6a68bd7b16ca6fed5124814ec828160296f" +rev = "5fc82783da41b253d629dbc55a72c23e7284b522" [patch.crates-io.ic-types] version = "0.1.2" #path = "../agent-rs/ic-types" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "abe5f6a68bd7b16ca6fed5124814ec828160296f" +rev = "5fc82783da41b253d629dbc55a72c23e7284b522" [patch.crates-io.ic-utils] version = "0.1.0" #path = "../agent-rs/ic-utils" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "abe5f6a68bd7b16ca6fed5124814ec828160296f" +rev = "5fc82783da41b253d629dbc55a72c23e7284b522" diff --git a/src/dfx/Cargo.toml b/src/dfx/Cargo.toml index 9843aeb6c7..31beac0f78 100644 --- a/src/dfx/Cargo.toml +++ b/src/dfx/Cargo.toml @@ -72,21 +72,21 @@ version = "0.1.0" #path = "../../../agent-rs/ic-agent" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "abe5f6a68bd7b16ca6fed5124814ec828160296f" +rev = "5fc82783da41b253d629dbc55a72c23e7284b522" [dependencies.ic-types] version = "0.1.2" #path = "../../../agent-rs/ic-types" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "abe5f6a68bd7b16ca6fed5124814ec828160296f" +rev = "5fc82783da41b253d629dbc55a72c23e7284b522" [dependencies.ic-utils] version = "0.1.0" #path = "../../../agent-rs/ic-utils" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "abe5f6a68bd7b16ca6fed5124814ec828160296f" +rev = "5fc82783da41b253d629dbc55a72c23e7284b522" [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 719524a178..5e8d793199 100644 --- a/src/dfx/src/lib/error/mod.rs +++ b/src/dfx/src/lib/error/mod.rs @@ -1,4 +1,4 @@ -use ic_agent::{AgentError, HttpErrorPayload}; +use ic_agent::AgentError; use ic_types::principal::PrincipalError; mod build; @@ -194,19 +194,10 @@ impl Display for DfxError { reject_code, reject_message ))?; } - DfxError::AgentError(AgentError::HttpError(HttpErrorPayload { - status, - content_type, - content, - })) if is_plain_text_utf8(content_type) => { + DfxError::AgentError(AgentError::HttpError(http_error_payload)) => { 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 - )) - ))?; + "Replica error: {}", + http_error_payload))?; } DfxError::Unknown(err) => { f.write_fmt(format_args!("Unknown error: {}", err))?; @@ -341,12 +332,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 - ) -} From 0f32c42bf426f036022f2fba2cbd0c6af19f1d63 Mon Sep 17 00:00:00 2001 From: Eric Swanson Date: Thu, 12 Nov 2020 14:16:56 -0800 Subject: [PATCH 08/14] format --- src/dfx/src/lib/error/mod.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/dfx/src/lib/error/mod.rs b/src/dfx/src/lib/error/mod.rs index 5e8d793199..fd0a26786a 100644 --- a/src/dfx/src/lib/error/mod.rs +++ b/src/dfx/src/lib/error/mod.rs @@ -195,9 +195,7 @@ impl Display for DfxError { ))?; } DfxError::AgentError(AgentError::HttpError(http_error_payload)) => { - f.write_fmt(format_args!( - "Replica error: {}", - http_error_payload))?; + f.write_fmt(format_args!("Replica error: {}", http_error_payload))?; } DfxError::Unknown(err) => { f.write_fmt(format_args!("Unknown error: {}", err))?; From 1356a0e972cb956d81339fd53bc33aa6a2eaaa4b Mon Sep 17 00:00:00 2001 From: Eric Swanson Date: Thu, 12 Nov 2020 15:25:14 -0800 Subject: [PATCH 09/14] update agent --- Cargo.lock | 6 +++--- Cargo.toml | 6 +++--- src/dfx/Cargo.toml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2b1dbc0296..d9de82a3ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1714,7 +1714,7 @@ dependencies = [ [[package]] name = "ic-agent" version = "0.1.0" -source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#5fc82783da41b253d629dbc55a72c23e7284b522" +source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#59f179f99c593343601cc1a8fc05f4476ba92e39" dependencies = [ "async-trait", "base32", @@ -1742,7 +1742,7 @@ dependencies = [ [[package]] name = "ic-types" version = "0.1.2" -source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#5fc82783da41b253d629dbc55a72c23e7284b522" +source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#59f179f99c593343601cc1a8fc05f4476ba92e39" dependencies = [ "base32", "crc32fast", @@ -1754,7 +1754,7 @@ dependencies = [ [[package]] name = "ic-utils" version = "0.1.0" -source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#5fc82783da41b253d629dbc55a72c23e7284b522" +source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#59f179f99c593343601cc1a8fc05f4476ba92e39" dependencies = [ "async-trait", "candid", diff --git a/Cargo.toml b/Cargo.toml index 8bd25c2956..122c7328c9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,18 +8,18 @@ version = "0.1.0" #path = "../agent-rs/ic-agent" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "5fc82783da41b253d629dbc55a72c23e7284b522" +rev = "59f179f99c593343601cc1a8fc05f4476ba92e39" [patch.crates-io.ic-types] version = "0.1.2" #path = "../agent-rs/ic-types" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "5fc82783da41b253d629dbc55a72c23e7284b522" +rev = "59f179f99c593343601cc1a8fc05f4476ba92e39" [patch.crates-io.ic-utils] version = "0.1.0" #path = "../agent-rs/ic-utils" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "5fc82783da41b253d629dbc55a72c23e7284b522" +rev = "59f179f99c593343601cc1a8fc05f4476ba92e39" diff --git a/src/dfx/Cargo.toml b/src/dfx/Cargo.toml index 31beac0f78..3ea66d4480 100644 --- a/src/dfx/Cargo.toml +++ b/src/dfx/Cargo.toml @@ -72,21 +72,21 @@ version = "0.1.0" #path = "../../../agent-rs/ic-agent" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "5fc82783da41b253d629dbc55a72c23e7284b522" +rev = "59f179f99c593343601cc1a8fc05f4476ba92e39" [dependencies.ic-types] version = "0.1.2" #path = "../../../agent-rs/ic-types" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "5fc82783da41b253d629dbc55a72c23e7284b522" +rev = "59f179f99c593343601cc1a8fc05f4476ba92e39" [dependencies.ic-utils] version = "0.1.0" #path = "../../../agent-rs/ic-utils" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "5fc82783da41b253d629dbc55a72c23e7284b522" +rev = "59f179f99c593343601cc1a8fc05f4476ba92e39" [dev-dependencies] env_logger = "0.6" From 2c5c2b4c5753e0bd4a41411ca022c3886ee4e60f Mon Sep 17 00:00:00 2001 From: Eric Swanson Date: Thu, 12 Nov 2020 15:28:48 -0800 Subject: [PATCH 10/14] cargo update --- Cargo.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 37d09cc001..ed44527174 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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=es-1139-resp-auth-use-read-state#59f179f99c593343601cc1a8fc05f4476ba92e39" dependencies = [ "async-trait", "base32", @@ -1750,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=es-1139-resp-auth-use-read-state#59f179f99c593343601cc1a8fc05f4476ba92e39" dependencies = [ "base32", "crc32fast", @@ -1762,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=es-1139-resp-auth-use-read-state#59f179f99c593343601cc1a8fc05f4476ba92e39" dependencies = [ "async-trait", "candid", From d19a3af42df3b6bb01109e197a869f4624a3d016 Mon Sep 17 00:00:00 2001 From: Eric Swanson Date: Wed, 18 Nov 2020 12:11:47 -0800 Subject: [PATCH 11/14] Update agent-rs, and ic-ref to release-0.13 (0.13.2) --- Cargo.lock | 82 +++++++++++++++++++++++----------------------- Cargo.toml | 6 ++-- nix/sources.json | 2 +- src/dfx/Cargo.toml | 6 ++-- 4 files changed, 48 insertions(+), 48 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ed44527174..fd02865ede 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=es-1139-resp-auth-use-read-state#59f179f99c593343601cc1a8fc05f4476ba92e39" +source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#c00ce02fbede617ffb2e38a0f84c91362b857d4b" dependencies = [ "async-trait", "base32", @@ -1750,7 +1750,7 @@ dependencies = [ [[package]] name = "ic-types" version = "0.1.2" -source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#59f179f99c593343601cc1a8fc05f4476ba92e39" +source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#c00ce02fbede617ffb2e38a0f84c91362b857d4b" dependencies = [ "base32", "crc32fast", @@ -1762,7 +1762,7 @@ dependencies = [ [[package]] name = "ic-utils" version = "0.1.0" -source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#59f179f99c593343601cc1a8fc05f4476ba92e39" +source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#c00ce02fbede617ffb2e38a0f84c91362b857d4b" dependencies = [ "async-trait", "candid", @@ -1957,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", ] @@ -2348,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", @@ -2436,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]] @@ -2456,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", @@ -2890,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", @@ -2900,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", @@ -3227,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" @@ -3251,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", ] @@ -3411,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", @@ -3497,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", @@ -3671,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", @@ -3691,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", @@ -3747,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 122c7328c9..9a0e27cf8f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,18 +8,18 @@ version = "0.1.0" #path = "../agent-rs/ic-agent" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "59f179f99c593343601cc1a8fc05f4476ba92e39" +rev = "c00ce02fbede617ffb2e38a0f84c91362b857d4b" [patch.crates-io.ic-types] version = "0.1.2" #path = "../agent-rs/ic-types" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "59f179f99c593343601cc1a8fc05f4476ba92e39" +rev = "c00ce02fbede617ffb2e38a0f84c91362b857d4b" [patch.crates-io.ic-utils] version = "0.1.0" #path = "../agent-rs/ic-utils" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "59f179f99c593343601cc1a8fc05f4476ba92e39" +rev = "c00ce02fbede617ffb2e38a0f84c91362b857d4b" diff --git a/nix/sources.json b/nix/sources.json index 33791cee39..ebb783645a 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -46,7 +46,7 @@ "ic-ref": { "branch": "release-0.13", "repo": "ssh://git@github.com/dfinity-lab/ic-ref", - "rev": "96deb731a6544371150d477cf2ac20c22f34164c", + "rev": "d08472d437c95534ee3d09e635a370522ea0fd37", "type": "git" }, "motoko": { diff --git a/src/dfx/Cargo.toml b/src/dfx/Cargo.toml index d1af57a871..78385b0924 100644 --- a/src/dfx/Cargo.toml +++ b/src/dfx/Cargo.toml @@ -72,21 +72,21 @@ version = "0.1.0" #path = "../../../agent-rs/ic-agent" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "59f179f99c593343601cc1a8fc05f4476ba92e39" +rev = "c00ce02fbede617ffb2e38a0f84c91362b857d4b" [dependencies.ic-types] version = "0.1.2" #path = "../../../agent-rs/ic-types" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "59f179f99c593343601cc1a8fc05f4476ba92e39" +rev = "c00ce02fbede617ffb2e38a0f84c91362b857d4b" [dependencies.ic-utils] version = "0.1.0" #path = "../../../agent-rs/ic-utils" git = "https://github.com/dfinity/agent-rs.git" branch = "es-1139-resp-auth-use-read-state" -rev = "59f179f99c593343601cc1a8fc05f4476ba92e39" +rev = "c00ce02fbede617ffb2e38a0f84c91362b857d4b" [dev-dependencies] env_logger = "0.6" From 601bfffff80b851d41b0449a62581192dcf064c6 Mon Sep 17 00:00:00 2001 From: Eric Swanson Date: Wed, 18 Nov 2020 12:51:18 -0800 Subject: [PATCH 12/14] reset to agent-rs next branch --- Cargo.lock | 6 +++--- Cargo.toml | 15 ++++++--------- src/dfx/Cargo.toml | 15 ++++++--------- 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fd02865ede..337e26c8ab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1722,7 +1722,7 @@ dependencies = [ [[package]] name = "ic-agent" version = "0.1.0" -source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#c00ce02fbede617ffb2e38a0f84c91362b857d4b" +source = "git+https://github.com/dfinity/agent-rs.git?branch=next#6c02ef4bf25d82652ceb60c93b9df1a8863f0524" dependencies = [ "async-trait", "base32", @@ -1750,7 +1750,7 @@ dependencies = [ [[package]] name = "ic-types" version = "0.1.2" -source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#c00ce02fbede617ffb2e38a0f84c91362b857d4b" +source = "git+https://github.com/dfinity/agent-rs.git?branch=next#6c02ef4bf25d82652ceb60c93b9df1a8863f0524" dependencies = [ "base32", "crc32fast", @@ -1762,7 +1762,7 @@ dependencies = [ [[package]] name = "ic-utils" version = "0.1.0" -source = "git+https://github.com/dfinity/agent-rs.git?branch=es-1139-resp-auth-use-read-state#c00ce02fbede617ffb2e38a0f84c91362b857d4b" +source = "git+https://github.com/dfinity/agent-rs.git?branch=next#6c02ef4bf25d82652ceb60c93b9df1a8863f0524" dependencies = [ "async-trait", "candid", diff --git a/Cargo.toml b/Cargo.toml index 9a0e27cf8f..19e9312853 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,21 +5,18 @@ members = [ [patch.crates-io.ic-agent] version = "0.1.0" -#path = "../agent-rs/ic-agent" git = "https://github.com/dfinity/agent-rs.git" -branch = "es-1139-resp-auth-use-read-state" -rev = "c00ce02fbede617ffb2e38a0f84c91362b857d4b" +branch = "next" +rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524" [patch.crates-io.ic-types] version = "0.1.2" -#path = "../agent-rs/ic-types" git = "https://github.com/dfinity/agent-rs.git" -branch = "es-1139-resp-auth-use-read-state" -rev = "c00ce02fbede617ffb2e38a0f84c91362b857d4b" +branch = "next" +rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524" [patch.crates-io.ic-utils] version = "0.1.0" -#path = "../agent-rs/ic-utils" git = "https://github.com/dfinity/agent-rs.git" -branch = "es-1139-resp-auth-use-read-state" -rev = "c00ce02fbede617ffb2e38a0f84c91362b857d4b" +branch = "next" +rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524" diff --git a/src/dfx/Cargo.toml b/src/dfx/Cargo.toml index 78385b0924..c0dbcfd2cd 100644 --- a/src/dfx/Cargo.toml +++ b/src/dfx/Cargo.toml @@ -69,24 +69,21 @@ wasmparser = "0.45.0" [dependencies.ic-agent] version = "0.1.0" -#path = "../../../agent-rs/ic-agent" git = "https://github.com/dfinity/agent-rs.git" -branch = "es-1139-resp-auth-use-read-state" -rev = "c00ce02fbede617ffb2e38a0f84c91362b857d4b" +branch = "next" +rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524" [dependencies.ic-types] version = "0.1.2" -#path = "../../../agent-rs/ic-types" git = "https://github.com/dfinity/agent-rs.git" -branch = "es-1139-resp-auth-use-read-state" -rev = "c00ce02fbede617ffb2e38a0f84c91362b857d4b" +branch = "next" +rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524" [dependencies.ic-utils] version = "0.1.0" -#path = "../../../agent-rs/ic-utils" git = "https://github.com/dfinity/agent-rs.git" -branch = "es-1139-resp-auth-use-read-state" -rev = "c00ce02fbede617ffb2e38a0f84c91362b857d4b" +branch = "next" +rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524" [dev-dependencies] env_logger = "0.6" From 9972a05edf2a5f2b314a68f0307d6b9b5d4be8ee Mon Sep 17 00:00:00 2001 From: Eric Swanson Date: Wed, 18 Nov 2020 12:53:30 -0800 Subject: [PATCH 13/14] revert Cargo.lock --- Cargo.lock | 83 +++++++++++++++++++++++++++--------------------------- 1 file changed, 41 insertions(+), 42 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 337e26c8ab..761bb18e81 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -135,7 +135,7 @@ dependencies = [ "log", "mime", "percent-encoding", - "pin-project 1.0.2", + "pin-project 1.0.1", "rand 0.7.3", "regex", "serde", @@ -143,7 +143,7 @@ dependencies = [ "serde_urlencoded", "sha-1", "slab", - "time 0.2.23", + "time 0.2.22", ] [[package]] @@ -310,14 +310,14 @@ dependencies = [ "log", "mime", "openssl", - "pin-project 1.0.2", + "pin-project 1.0.1", "regex", "rustls", "serde", "serde_json", "serde_urlencoded", "socket2", - "time 0.2.23", + "time 0.2.22", "tinyvec", "url", ] @@ -860,7 +860,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "784ad0fbab4f3e9cef09f20e0aea6000ae08d2cb98ac4c0abc53df18803d702f" dependencies = [ "percent-encoding", - "time 0.2.23", + "time 0.2.22", "version_check 0.9.2", ] @@ -1499,7 +1499,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project 1.0.2", + "pin-project 1.0.1", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -1682,7 +1682,7 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project 1.0.2", + "pin-project 1.0.1", "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#6c02ef4bf25d82652ceb60c93b9df1a8863f0524" +source = "git+https://github.com/dfinity/agent-rs.git?branch=next#132d7995435aeaf8011ee02c0b4009c292c5c2cd" dependencies = [ "async-trait", "base32", @@ -1732,7 +1732,6 @@ dependencies = [ "hex", "ic-types", "leb128", - "mime", "openssl", "pem 0.8.1", "rand 0.7.3", @@ -1750,7 +1749,7 @@ dependencies = [ [[package]] name = "ic-types" version = "0.1.2" -source = "git+https://github.com/dfinity/agent-rs.git?branch=next#6c02ef4bf25d82652ceb60c93b9df1a8863f0524" +source = "git+https://github.com/dfinity/agent-rs.git?branch=next#132d7995435aeaf8011ee02c0b4009c292c5c2cd" dependencies = [ "base32", "crc32fast", @@ -1762,7 +1761,7 @@ dependencies = [ [[package]] name = "ic-utils" version = "0.1.0" -source = "git+https://github.com/dfinity/agent-rs.git?branch=next#6c02ef4bf25d82652ceb60c93b9df1a8863f0524" +source = "git+https://github.com/dfinity/agent-rs.git?branch=next#132d7995435aeaf8011ee02c0b4009c292c5c2cd" dependencies = [ "async-trait", "candid", @@ -1957,9 +1956,9 @@ checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" [[package]] name = "lock_api" -version = "0.4.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" +checksum = "28247cc5a5be2f05fbcd76dd0cf2c7d3b5400cb978a28042abcd4fa0b3f8261c" dependencies = [ "scopeguard", ] @@ -2348,9 +2347,9 @@ checksum = "afb2e1c3ee07430c2cf76151675e583e0f19985fa6efae47d6848a3e2c824f85" [[package]] name = "parking_lot" -version = "0.11.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +checksum = "a4893845fa2ca272e647da5d0e46660a314ead9c2fdd9a883aabc32e481a8733" dependencies = [ "instant", "lock_api", @@ -2436,11 +2435,11 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7" +checksum = "ee41d838744f60d959d7074e3afb6b35c7456d0f61cad38a24e35e6553f73841" dependencies = [ - "pin-project-internal 1.0.2", + "pin-project-internal 1.0.1", ] [[package]] @@ -2456,9 +2455,9 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "1.0.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f" +checksum = "81a4ffa594b66bff340084d4081df649a7dc049ac8d7fc458d8e628bfbbb2f86" dependencies = [ "proc-macro2", "quote", @@ -2890,9 +2889,9 @@ dependencies = [ [[package]] name = "resolv-conf" -version = "0.7.0" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" +checksum = "11834e137f3b14e309437a8276714eed3a80d1ef894869e510f2c0c0b98b9f4a" dependencies = [ "hostname", "quick-error", @@ -2900,9 +2899,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.16.16" +version = "0.16.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72b84d47e8ec5a4f2872e8262b8f8256c5be1c938a7d6d3a867a3ba8f722f74" +checksum = "952cd6b98c85bbc30efa1ba5783b8abf12fec8b3287ffa52605b9432313e34e4" dependencies = [ "cc", "libc", @@ -3227,9 +3226,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.5.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acad6f34eb9e8a259d3283d1e8c1d34d7415943d4895f65cc73813c7396fc85" +checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252" [[package]] name = "socket2" @@ -3251,9 +3250,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "standback" -version = "0.2.13" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf906c8b8fc3f6ecd1046e01da1d8ddec83e48c8b08b84dcc02b585a6bedf5a8" +checksum = "f4e0831040d2cf2bdfd51b844be71885783d489898a192f254ae25d57cce725c" dependencies = [ "version_check 0.9.2", ] @@ -3411,18 +3410,18 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf11676eb135389f21fcda654382c4859bbfc1d2f36e4425a2f829bb41b1e20e" +checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" dependencies = [ "winapi-util", ] [[package]] name = "terminal_size" -version = "0.1.15" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd2d183bd3fac5f5fe38ddbeb4dc9aec4a39a9d7d59e7491d900302da01cbe1" +checksum = "9a14cd9f8c72704232f0bfc8455c0e861f0ad4eb60cc9ec8a170e231414c1e13" dependencies = [ "libc", "winapi 0.3.9", @@ -3497,9 +3496,9 @@ dependencies = [ [[package]] name = "time" -version = "0.2.23" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcdaeea317915d59b2b4cd3b5efcd156c309108664277793f5351700c02ce98b" +checksum = "55b7151c9065e80917fbf285d9a5d1432f60db41d170ccafc749a136b41a93af" dependencies = [ "const_fn", "libc", @@ -3671,9 +3670,9 @@ checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" [[package]] name = "trust-dns-proto" -version = "0.19.6" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53861fcb288a166aae4c508ae558ed18b53838db728d4d310aad08270a7d4c2b" +checksum = "cdd7061ba6f4d4d9721afedffbfd403f20f39a4301fee1b70d6fcd09cca69f28" dependencies = [ "async-trait", "backtrace", @@ -3691,9 +3690,9 @@ dependencies = [ [[package]] name = "trust-dns-resolver" -version = "0.19.6" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6759e8efc40465547b0dfce9500d733c65f969a4cbbfbe3ccf68daaa46ef179e" +checksum = "0f23cdfdc3d8300b3c50c9e84302d3bd6d860fb9529af84ace6cf9665f181b77" dependencies = [ "backtrace", "cfg-if 0.1.10", @@ -3747,18 +3746,18 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.15" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1e9a0b71dba18b6fa17c7b3dcf1440bb3522552deb2f84bf47dabd9fb7e5570" +checksum = "b7f98e67a4d84f730d343392f9bfff7d21e3fca562b9cb7a43b768350beeddc6" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.7.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8716a166f290ff49dabc18b44aa407cb7c6dbe1aa0971b44b8a24b0ca35aae" +checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" [[package]] name = "unicode-width" From b8edda1dc2514cd8c8777897aa707e113ce560cb Mon Sep 17 00:00:00 2001 From: Eric Swanson Date: Wed, 18 Nov 2020 12:53:47 -0800 Subject: [PATCH 14/14] Update cargo.lock; --- Cargo.lock | 83 +++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 41 deletions(-) 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"