From 7a63a8256cc35554b96ae07194c85050ca31e76b Mon Sep 17 00:00:00 2001
From: Eric Swanson <eric.swanson@dfinity.org>
Date: Thu, 7 Nov 2024 15:54:46 -0800
Subject: [PATCH] dfx commits

---
 Cargo.lock | 96 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 Cargo.toml |  6 ++--
 2 files changed, 91 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9ff9f11..5b76dc6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1357,7 +1357,7 @@ dependencies = [
 [[package]]
 name = "dfx-core"
 version = "0.1.0"
-source = "git+https://github.com/dfinity/sdk?rev=10391754ccd8d5eb92890f896369bd7c8b62af56#10391754ccd8d5eb92890f896369bd7c8b62af56"
+source = "git+https://github.com/dfinity/sdk?rev=7c5778a4b3c36806353f3f93ea04c7a76c42dea1#7c5778a4b3c36806353f3f93ea04c7a76c42dea1"
 dependencies = [
  "aes-gcm",
  "argon2",
@@ -1374,9 +1374,9 @@ dependencies = [
  "handlebars",
  "hex",
  "humantime-serde",
- "ic-agent 0.38.2",
+ "ic-agent 0.38.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "ic-identity-hsm",
- "ic-utils 0.38.2",
+ "ic-utils 0.38.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "itertools 0.10.5",
  "k256 0.11.6",
  "keyring",
@@ -2517,7 +2517,49 @@ dependencies = [
  "http 1.1.0",
  "http-body 1.0.1",
  "ic-certification",
- "ic-transport-types 0.38.2",
+ "ic-transport-types 0.38.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ic-verify-bls-signature",
+ "k256 0.13.4",
+ "leb128",
+ "p256",
+ "pem 3.0.4",
+ "pkcs8 0.10.2",
+ "rand",
+ "rangemap",
+ "reqwest 0.12.8",
+ "ring 0.17.8",
+ "rustls-webpki 0.102.8",
+ "sec1 0.7.3",
+ "serde",
+ "serde_bytes",
+ "serde_cbor",
+ "serde_repr",
+ "sha2 0.10.8",
+ "simple_asn1",
+ "thiserror",
+ "time",
+ "tokio",
+ "tower-service",
+ "url",
+]
+
+[[package]]
+name = "ic-agent"
+version = "0.38.2"
+source = "git+https://github.com/dfinity/agent-rs?rev=4642e30ab6cf148ad94bda0c12f1b9330377de36#4642e30ab6cf148ad94bda0c12f1b9330377de36"
+dependencies = [
+ "async-lock 3.4.0",
+ "async-trait",
+ "backoff",
+ "cached",
+ "candid",
+ "ed25519-consensus",
+ "futures-util",
+ "hex",
+ "http 1.1.0",
+ "http-body 1.0.1",
+ "ic-certification",
+ "ic-transport-types 0.38.2 (git+https://github.com/dfinity/agent-rs?rev=4642e30ab6cf148ad94bda0c12f1b9330377de36)",
  "ic-verify-bls-signature",
  "k256 0.13.4",
  "leb128",
@@ -2960,7 +3002,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccb4b9a8628378f958d63526d322486a9bb3fde81bccf0ac2fa720b8b241f068"
 dependencies = [
  "hex",
- "ic-agent 0.38.2",
+ "ic-agent 0.38.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "pkcs11",
  "sha2 0.10.8",
  "simple_asn1",
@@ -3765,6 +3807,23 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "ic-transport-types"
+version = "0.38.2"
+source = "git+https://github.com/dfinity/agent-rs?rev=4642e30ab6cf148ad94bda0c12f1b9330377de36#4642e30ab6cf148ad94bda0c12f1b9330377de36"
+dependencies = [
+ "candid",
+ "hex",
+ "ic-certification",
+ "leb128",
+ "serde",
+ "serde_bytes",
+ "serde_cbor",
+ "serde_repr",
+ "sha2 0.10.8",
+ "thiserror",
+]
+
 [[package]]
 name = "ic-types"
 version = "0.9.0"
@@ -3822,7 +3881,28 @@ dependencies = [
  "async-trait",
  "candid",
  "futures-util",
- "ic-agent 0.38.2",
+ "ic-agent 0.38.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "once_cell",
+ "semver",
+ "serde",
+ "serde_bytes",
+ "sha2 0.10.8",
+ "strum",
+ "strum_macros",
+ "thiserror",
+ "time",
+ "tokio",
+]
+
+[[package]]
+name = "ic-utils"
+version = "0.38.2"
+source = "git+https://github.com/dfinity/agent-rs?rev=4642e30ab6cf148ad94bda0c12f1b9330377de36#4642e30ab6cf148ad94bda0c12f1b9330377de36"
+dependencies = [
+ "async-trait",
+ "candid",
+ "futures-util",
+ "ic-agent 0.38.2 (git+https://github.com/dfinity/agent-rs?rev=4642e30ab6cf148ad94bda0c12f1b9330377de36)",
  "once_cell",
  "semver",
  "serde",
@@ -4516,13 +4596,13 @@ dependencies = [
  "fn-error-context",
  "futures-util",
  "hex",
- "ic-agent 0.38.2",
+ "ic-agent 0.38.2 (git+https://github.com/dfinity/agent-rs?rev=4642e30ab6cf148ad94bda0c12f1b9330377de36)",
  "ic-http-utils",
  "ic-icp-index",
  "ic-icrc1-index-ng",
  "ic-icrc1-ledger",
  "ic-sns-cli",
- "ic-utils 0.38.2",
+ "ic-utils 0.38.2 (git+https://github.com/dfinity/agent-rs?rev=4642e30ab6cf148ad94bda0c12f1b9330377de36)",
  "reqwest 0.11.27",
  "rust_decimal",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index eecaac0..9d9ea3e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ license = "Apache-2.0"
 repository = "https://github.com/dfinity/dfx-extensions"
 
 [workspace.dependencies]
-dfx-core = { git = "https://github.com/dfinity/sdk", rev = "10391754ccd8d5eb92890f896369bd7c8b62af56" }
+dfx-core = { git = "https://github.com/dfinity/sdk", rev = "7c5778a4b3c36806353f3f93ea04c7a76c42dea1" }
 dfx-extensions-utils.path = "./extensions-utils"
 
 anyhow = "^1"
@@ -21,8 +21,8 @@ flate2 = { version = "1.0.25", default-features = false, features = [
 ] }
 fn-error-context = "0.2.1"
 futures-util = "0.3.28"
-ic-agent = "0.38" # { git = "https://github.com/dfinity/agent-rs", rev = "6e11a350112f9b907c4d590d8217f340e153d898" }
-ic-utils = "0.38" # { git = "https://github.com/dfinity/agent-rs", rev = "6e11a350112f9b907c4d590d8217f340e153d898" }
+ic-agent = { git = "https://github.com/dfinity/agent-rs", rev = "4642e30ab6cf148ad94bda0c12f1b9330377de36" }
+ic-utils = { git = "https://github.com/dfinity/agent-rs", rev = "4642e30ab6cf148ad94bda0c12f1b9330377de36" }
 reqwest = { version = "^0.11.22", default-features = false, features = [
     "blocking",
     "json",