From c2549ad8f547342f34200d3079ba75c38e918c5e Mon Sep 17 00:00:00 2001 From: Eric Swanson Date: Mon, 1 Nov 2021 13:57:34 -0700 Subject: [PATCH 1/3] chore: update to agent-rs w/o icx-proxy --- Cargo.lock | 8 ++++---- Cargo.toml | 8 ++++---- nix/sources.json | 4 ++-- src/dfx/Cargo.toml | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b8c43b177d..e7b9599826 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1814,7 +1814,7 @@ dependencies = [ [[package]] name = "ic-agent" version = "0.9.0" -source = "git+https://github.com/dfinity/agent-rs.git?rev=c712fdfe4edc7f34a0140dba129025f6d58ffd06#c712fdfe4edc7f34a0140dba129025f6d58ffd06" +source = "git+https://github.com/dfinity/agent-rs.git?rev=dc476cd66228542ea9e463ba77f63e04fbd5fb24#dc476cd66228542ea9e463ba77f63e04fbd5fb24" dependencies = [ "async-trait", "base32", @@ -1844,7 +1844,7 @@ dependencies = [ [[package]] name = "ic-asset" version = "0.4.0" -source = "git+https://github.com/dfinity/agent-rs.git?rev=c712fdfe4edc7f34a0140dba129025f6d58ffd06#c712fdfe4edc7f34a0140dba129025f6d58ffd06" +source = "git+https://github.com/dfinity/agent-rs.git?rev=dc476cd66228542ea9e463ba77f63e04fbd5fb24#dc476cd66228542ea9e463ba77f63e04fbd5fb24" dependencies = [ "anyhow", "candid", @@ -1867,7 +1867,7 @@ dependencies = [ [[package]] name = "ic-identity-hsm" version = "0.3.6" -source = "git+https://github.com/dfinity/agent-rs.git?rev=c712fdfe4edc7f34a0140dba129025f6d58ffd06#c712fdfe4edc7f34a0140dba129025f6d58ffd06" +source = "git+https://github.com/dfinity/agent-rs.git?rev=dc476cd66228542ea9e463ba77f63e04fbd5fb24#dc476cd66228542ea9e463ba77f63e04fbd5fb24" dependencies = [ "hex", "ic-agent", @@ -1896,7 +1896,7 @@ dependencies = [ [[package]] name = "ic-utils" version = "0.7.0" -source = "git+https://github.com/dfinity/agent-rs.git?rev=c712fdfe4edc7f34a0140dba129025f6d58ffd06#c712fdfe4edc7f34a0140dba129025f6d58ffd06" +source = "git+https://github.com/dfinity/agent-rs.git?rev=dc476cd66228542ea9e463ba77f63e04fbd5fb24#dc476cd66228542ea9e463ba77f63e04fbd5fb24" dependencies = [ "async-trait", "candid", diff --git a/Cargo.toml b/Cargo.toml index 7c8d4b73a7..c3f223ff0c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,19 +6,19 @@ members = [ [patch.crates-io.ic-agent] version = "0.9.0" git = "https://github.com/dfinity/agent-rs.git" -rev = "c712fdfe4edc7f34a0140dba129025f6d58ffd06" +rev = "dc476cd66228542ea9e463ba77f63e04fbd5fb24" [patch.crates-io.ic-asset] version = "0.4.0" git = "https://github.com/dfinity/agent-rs.git" -rev = "c712fdfe4edc7f34a0140dba129025f6d58ffd06" +rev = "dc476cd66228542ea9e463ba77f63e04fbd5fb24" [patch.crates-io.ic-identity-hsm] version = "0.3.6" git = "https://github.com/dfinity/agent-rs.git" -rev = "c712fdfe4edc7f34a0140dba129025f6d58ffd06" +rev = "dc476cd66228542ea9e463ba77f63e04fbd5fb24" [patch.crates-io.ic-utils] version = "0.7.0" git = "https://github.com/dfinity/agent-rs.git" -rev = "c712fdfe4edc7f34a0140dba129025f6d58ffd06" +rev = "dc476cd66228542ea9e463ba77f63e04fbd5fb24" diff --git a/nix/sources.json b/nix/sources.json index 38f88d176c..17cf5970be 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -13,9 +13,9 @@ "url_template": "https://github.com///archive/.tar.gz" }, "agent-rs": { - "branch": "main", + "branch": "remove-icx-proxy", "repo": "https://github.com/dfinity/agent-rs", - "rev": "c712fdfe4edc7f34a0140dba129025f6d58ffd06", + "rev": "dc476cd66228542ea9e463ba77f63e04fbd5fb24", "type": "git" }, "bats-support": { diff --git a/src/dfx/Cargo.toml b/src/dfx/Cargo.toml index f19b92ef51..77e9ab7e62 100644 --- a/src/dfx/Cargo.toml +++ b/src/dfx/Cargo.toml @@ -82,23 +82,23 @@ webpki-roots = "0.21.0" [dependencies.ic-agent] version = "0.9.0" git = "https://github.com/dfinity/agent-rs.git" -rev = "c712fdfe4edc7f34a0140dba129025f6d58ffd06" +rev = "dc476cd66228542ea9e463ba77f63e04fbd5fb24" features = ["reqwest"] [dependencies.ic-asset] version = "0.4.0" git = "https://github.com/dfinity/agent-rs.git" -rev = "c712fdfe4edc7f34a0140dba129025f6d58ffd06" +rev = "dc476cd66228542ea9e463ba77f63e04fbd5fb24" [dependencies.ic-identity-hsm] version = "0.3.6" git = "https://github.com/dfinity/agent-rs.git" -rev = "c712fdfe4edc7f34a0140dba129025f6d58ffd06" +rev = "dc476cd66228542ea9e463ba77f63e04fbd5fb24" [dependencies.ic-utils] version = "0.7.0" git = "https://github.com/dfinity/agent-rs.git" -rev = "c712fdfe4edc7f34a0140dba129025f6d58ffd06" +rev = "dc476cd66228542ea9e463ba77f63e04fbd5fb24" [dev-dependencies] env_logger = "0.6" From 05c80f131fad7df3ecc66591037bf266aac5bd65 Mon Sep 17 00:00:00 2001 From: Eric Swanson Date: Mon, 1 Nov 2021 17:45:06 -0700 Subject: [PATCH 2/3] agent-rs PR merged --- Cargo.lock | 8 ++++---- Cargo.toml | 8 ++++---- nix/sources.json | 4 ++-- src/dfx/Cargo.toml | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e7b9599826..86913a04f5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1814,7 +1814,7 @@ dependencies = [ [[package]] name = "ic-agent" version = "0.9.0" -source = "git+https://github.com/dfinity/agent-rs.git?rev=dc476cd66228542ea9e463ba77f63e04fbd5fb24#dc476cd66228542ea9e463ba77f63e04fbd5fb24" +source = "git+https://github.com/dfinity/agent-rs.git?rev=68fcd7db69d42e0c678274e40f629bfd0fcf30d0#68fcd7db69d42e0c678274e40f629bfd0fcf30d0" dependencies = [ "async-trait", "base32", @@ -1844,7 +1844,7 @@ dependencies = [ [[package]] name = "ic-asset" version = "0.4.0" -source = "git+https://github.com/dfinity/agent-rs.git?rev=dc476cd66228542ea9e463ba77f63e04fbd5fb24#dc476cd66228542ea9e463ba77f63e04fbd5fb24" +source = "git+https://github.com/dfinity/agent-rs.git?rev=68fcd7db69d42e0c678274e40f629bfd0fcf30d0#68fcd7db69d42e0c678274e40f629bfd0fcf30d0" dependencies = [ "anyhow", "candid", @@ -1867,7 +1867,7 @@ dependencies = [ [[package]] name = "ic-identity-hsm" version = "0.3.6" -source = "git+https://github.com/dfinity/agent-rs.git?rev=dc476cd66228542ea9e463ba77f63e04fbd5fb24#dc476cd66228542ea9e463ba77f63e04fbd5fb24" +source = "git+https://github.com/dfinity/agent-rs.git?rev=68fcd7db69d42e0c678274e40f629bfd0fcf30d0#68fcd7db69d42e0c678274e40f629bfd0fcf30d0" dependencies = [ "hex", "ic-agent", @@ -1896,7 +1896,7 @@ dependencies = [ [[package]] name = "ic-utils" version = "0.7.0" -source = "git+https://github.com/dfinity/agent-rs.git?rev=dc476cd66228542ea9e463ba77f63e04fbd5fb24#dc476cd66228542ea9e463ba77f63e04fbd5fb24" +source = "git+https://github.com/dfinity/agent-rs.git?rev=68fcd7db69d42e0c678274e40f629bfd0fcf30d0#68fcd7db69d42e0c678274e40f629bfd0fcf30d0" dependencies = [ "async-trait", "candid", diff --git a/Cargo.toml b/Cargo.toml index c3f223ff0c..cc382abe8c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,19 +6,19 @@ members = [ [patch.crates-io.ic-agent] version = "0.9.0" git = "https://github.com/dfinity/agent-rs.git" -rev = "dc476cd66228542ea9e463ba77f63e04fbd5fb24" +rev = "68fcd7db69d42e0c678274e40f629bfd0fcf30d0" [patch.crates-io.ic-asset] version = "0.4.0" git = "https://github.com/dfinity/agent-rs.git" -rev = "dc476cd66228542ea9e463ba77f63e04fbd5fb24" +rev = "68fcd7db69d42e0c678274e40f629bfd0fcf30d0" [patch.crates-io.ic-identity-hsm] version = "0.3.6" git = "https://github.com/dfinity/agent-rs.git" -rev = "dc476cd66228542ea9e463ba77f63e04fbd5fb24" +rev = "68fcd7db69d42e0c678274e40f629bfd0fcf30d0" [patch.crates-io.ic-utils] version = "0.7.0" git = "https://github.com/dfinity/agent-rs.git" -rev = "dc476cd66228542ea9e463ba77f63e04fbd5fb24" +rev = "68fcd7db69d42e0c678274e40f629bfd0fcf30d0" diff --git a/nix/sources.json b/nix/sources.json index 17cf5970be..12a82ca935 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -13,9 +13,9 @@ "url_template": "https://github.com///archive/.tar.gz" }, "agent-rs": { - "branch": "remove-icx-proxy", + "branch": "main", "repo": "https://github.com/dfinity/agent-rs", - "rev": "dc476cd66228542ea9e463ba77f63e04fbd5fb24", + "rev": "68fcd7db69d42e0c678274e40f629bfd0fcf30d0", "type": "git" }, "bats-support": { diff --git a/src/dfx/Cargo.toml b/src/dfx/Cargo.toml index 77e9ab7e62..3d92c715c0 100644 --- a/src/dfx/Cargo.toml +++ b/src/dfx/Cargo.toml @@ -82,23 +82,23 @@ webpki-roots = "0.21.0" [dependencies.ic-agent] version = "0.9.0" git = "https://github.com/dfinity/agent-rs.git" -rev = "dc476cd66228542ea9e463ba77f63e04fbd5fb24" +rev = "68fcd7db69d42e0c678274e40f629bfd0fcf30d0" features = ["reqwest"] [dependencies.ic-asset] version = "0.4.0" git = "https://github.com/dfinity/agent-rs.git" -rev = "dc476cd66228542ea9e463ba77f63e04fbd5fb24" +rev = "68fcd7db69d42e0c678274e40f629bfd0fcf30d0" [dependencies.ic-identity-hsm] version = "0.3.6" git = "https://github.com/dfinity/agent-rs.git" -rev = "dc476cd66228542ea9e463ba77f63e04fbd5fb24" +rev = "68fcd7db69d42e0c678274e40f629bfd0fcf30d0" [dependencies.ic-utils] version = "0.7.0" git = "https://github.com/dfinity/agent-rs.git" -rev = "dc476cd66228542ea9e463ba77f63e04fbd5fb24" +rev = "68fcd7db69d42e0c678274e40f629bfd0fcf30d0" [dev-dependencies] env_logger = "0.6" From e0257a2c4d652e9bf0165ddb888f9d27c91f9401 Mon Sep 17 00:00:00 2001 From: Eric Swanson Date: Mon, 1 Nov 2021 17:50:39 -0700 Subject: [PATCH 3/3] nix-hash --- scripts/write-dfx-asset-sources.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/write-dfx-asset-sources.sh b/scripts/write-dfx-asset-sources.sh index 2694594d08..1a93a8beba 100755 --- a/scripts/write-dfx-asset-sources.sh +++ b/scripts/write-dfx-asset-sources.sh @@ -23,7 +23,7 @@ read_sha256_from_nix_sources() { SHA256_BASE32=$(jq -r .'"'"$KEY"'".sha256' "$NIX_SOURCES_JSON") - nix to-base16 --type sha256 "$SHA256_BASE32" + nix-hash --to-base16 --type sha256 "$SHA256_BASE32" } read_url_from_nix_sources() {