feat: [wip] remainder of response authentication (1)

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 = "next"
-rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524"
+branch = "es-wip-resp-auth"
+rev = "d8d2649ad0e4e8bb5328d5e97b6705c5275afe7a"
 
 [patch.crates-io.ic-types]
 version = "0.1.2"
+#path = "../agent-rs/ic-types"
 git = "https://github.com/dfinity/agent-rs.git"
-branch = "next"
-rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524"
+branch = "es-wip-resp-auth"
+rev = "d8d2649ad0e4e8bb5328d5e97b6705c5275afe7a"
 
 [patch.crates-io.ic-utils]
 version = "0.1.0"
+#path = "../agent-rs/ic-utils"
 git = "https://github.com/dfinity/agent-rs.git"
-branch = "next"
-rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524"
+branch = "es-wip-resp-auth"
+rev = "d8d2649ad0e4e8bb5328d5e97b6705c5275afe7a"

e2e/bats/build.bash

@@ -94,9 +94,10 @@ teardown() {
     dfx_start
 
     webserver_port=$(cat .dfx/webserver-port)
-    assert_command dfx config networks.ic.providers '[ "http://127.0.0.1:'$webserver_port'" ]'
-    assert_command dfx canister --network ic create --all
-    assert_command dfx build --network ic
+    cat <<<$(jq .networks.actuallylocal.providers=[\"http://127.0.0.1:$webserver_port\"] dfx.json) >dfx.json
+
+    assert_command dfx canister --network actuallylocal create --all
+    assert_command dfx build --network actuallylocal
 }
 
 @test "build output for local network is in expected directory" {
@@ -110,10 +111,10 @@ teardown() {
 @test "build output for non-local network is in expected directory" {
   dfx_start
   webserver_port=$(cat .dfx/webserver-port)
-  assert_command dfx config networks.ic.providers '[ "http://127.0.0.1:'$webserver_port'" ]'
-  dfx canister --network ic create --all
-  assert_command dfx build --network ic
-  assert_command ls .dfx/ic/canisters/e2e_project/
-  assert_command ls .dfx/ic/canisters/e2e_project/e2e_project.wasm
+  cat <<<$(jq .networks.actuallylocal.providers=[\"http://127.0.0.1:$webserver_port\"] dfx.json) >dfx.json
+  dfx canister --network actuallylocal create --all
+  assert_command dfx build --network actuallylocal
+  assert_command ls .dfx/actuallylocal/canisters/e2e_project/
+  assert_command ls .dfx/actuallylocal/canisters/e2e_project/e2e_project.wasm
 }
 

e2e/bats/create.bash

@@ -53,21 +53,22 @@ teardown() {
     dfx_start
 
     webserver_port=$(cat .dfx/webserver-port)
-    assert_command dfx config networks.ic.providers '[ "http://127.0.0.1:'$webserver_port'" ]'
-    assert_command dfx canister --network ic create --all
+    cat <<<$(jq .networks.actuallylocal.providers=[\"http://127.0.0.1:$webserver_port\"] dfx.json) >dfx.json
+    assert_command dfx canister --network actuallylocal create --all
 }
 
 @test "create fails if selected network exists but has no providers" {
     dfx_start
 
     assert_command dfx config networks.ic.providers '[  ]'
-    assert_command_fail dfx canister --network ic create --all
+    cat <<<$(jq .networks.actuallylocal.providers=[] dfx.json) >dfx.json
+    assert_command_fail dfx canister --network actuallylocal create --all
     assert_match "ComputeNetworkHasNoProviders"
 }
 
 @test "create fails with network parameter when network does not exist" {
     dfx_start
-    assert_command dfx config networks.ic.providers '[ "http://not-real.nowhere.test." ]'
-    assert_command_fail dfx canister --network ic create --all
+    cat <<<$(jq .networks.actuallylocal.providers=[\"http://not-real.nowhere.test.\"] dfx.json) >dfx.json
+    assert_command_fail dfx canister --network actuallylocal create --all
     assert_match "ConnectError"
 }

e2e/bats/network.bash

@@ -18,27 +18,27 @@ teardown() {
     dfx_start
 
     webserver_port=$(cat .dfx/webserver-port)
-    assert_command dfx config networks.ic.providers '[ "http://127.0.0.1:'$webserver_port'" ]'
+    cat <<<$(jq .networks.actuallylocal.providers=[\"http://127.0.0.1:$webserver_port\"] dfx.json) >dfx.json
 
-    assert_command dfx canister --network ic create --all
+    assert_command dfx canister --network actuallylocal create --all
 
     # canister creates writes to a spinner (stderr), not stdout
-    assert_command dfx canister --network ic id e2e_project
-    assert_match $(cat canister_ids.json | jq -r .e2e_project.ic)
+    assert_command dfx canister --network actuallylocal id e2e_project
+    assert_match $(cat canister_ids.json | jq -r .e2e_project.actuallylocal)
 }
 
 @test "create stores canister ids for configured-ephemeral networks in canister_ids.json" {
     dfx_start
 
     webserver_port=$(cat .dfx/webserver-port)
-    assert_command dfx config networks.ic.providers '[ "http://127.0.0.1:'$webserver_port'" ]'
-    cat <<<$(jq .networks.ic.type=\"ephemeral\" dfx.json) >dfx.json
+    cat <<<$(jq .networks.actuallylocal.providers=[\"http://127.0.0.1:$webserver_port\"] dfx.json) >dfx.json
+    cat <<<$(jq .networks.actuallylocal.type=\"ephemeral\" dfx.json) >dfx.json
 
-    assert_command dfx canister --network ic create --all
+    assert_command dfx canister --network actuallylocal create --all
 
     # canister creates writes to a spinner (stderr), not stdout
-    assert_command dfx canister --network ic id e2e_project
-    assert_match $(cat .dfx/ic/canister_ids.json | jq -r .e2e_project.ic)
+    assert_command dfx canister --network actuallylocal id e2e_project
+    assert_match $(cat .dfx/actuallylocal/canister_ids.json | jq -r .e2e_project.actuallylocal)
 }
 
 @test "create stores canister ids for default-ephemeral local networks in .dfx/{network}canister_ids.json" {
@@ -74,8 +74,8 @@ teardown() {
     dfx_start
 
     webserver_port=$(cat .dfx/webserver-port)
-    assert_command dfx config networks.ic.providers '[ "http://127.0.0.1:'$webserver_port'" ]'
+    cat <<<$(jq .networks.actuallylocal.providers=[\"http://127.0.0.1:$webserver_port\"] dfx.json) >dfx.json
 
-    assert_command_fail dfx build --network ic
-    assert_match "Cannot find canister id. Please issue 'dfx canister --network ic create e2e_project"
+    assert_command_fail dfx build --network actuallylocal
+    assert_match "Cannot find canister id. Please issue 'dfx canister --network actuallylocal create e2e_project"
 }

nix/sources.json

@@ -40,7 +40,7 @@
     "dfinity": {
         "branch": "master",
         "repo": "ssh://git@github.com/dfinity-lab/dfinity",
-        "rev": "482ba09bfa3a0ac41209684e947e83b8e0c83138",
+        "rev": "19da081c7fb438f10b25abcb7fee0796ec79ad7b",
         "type": "git"
     },
     "ic-ref": {

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 = "next"
-rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524"
+branch = "es-wip-resp-auth"
+rev = "d8d2649ad0e4e8bb5328d5e97b6705c5275afe7a"
 
 [dependencies.ic-types]
 version = "0.1.2"
+#path = "../../../agent-rs/ic-types"
 git = "https://github.com/dfinity/agent-rs.git"
-branch = "next"
-rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524"
+branch = "es-wip-resp-auth"
+rev = "d8d2649ad0e4e8bb5328d5e97b6705c5275afe7a"
 
 [dependencies.ic-utils]
 version = "0.1.0"
+#path = "../../../agent-rs/ic-utils"
 git = "https://github.com/dfinity/agent-rs.git"
-branch = "next"
-rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524"
+branch = "es-wip-resp-auth"
+rev = "d8d2649ad0e4e8bb5328d5e97b6705c5275afe7a"
 
 [dev-dependencies]
 env_logger = "0.6"

src/dfx/src/commands/canister/call.rs

@@ -2,6 +2,7 @@ use crate::lib::canister_info::CanisterInfo;
 use crate::lib::environment::Environment;
 use crate::lib::error::{DfxError, DfxResult};
 use crate::lib::models::canister_id_store::CanisterIdStore;
+use crate::lib::root_key::fetch_root_key_if_needed;
 use crate::lib::waiter::waiter_with_timeout;
 use crate::util::{blob_from_arguments, expiry_duration, get_candid_type, print_idl_blob};
 use clap::{App, ArgMatches, Clap, FromArgMatches, IntoApp};
@@ -110,6 +111,8 @@ pub fn exec(env: &dyn Environment, args: &ArgMatches) -> DfxResult {
         .ok_or(DfxError::CommandMustBeRunInAProject)?;
     let mut runtime = Runtime::new().expect("Unable to create a runtime");
 
+    runtime.block_on(fetch_root_key_if_needed(env))?;
+
     let timeout = expiry_duration();
 
     if is_query {

src/dfx/src/commands/canister/create.rs

@@ -1,6 +1,7 @@
 use crate::lib::environment::Environment;
 use crate::lib::error::{DfxError, DfxResult};
 use crate::lib::operations::canister::create_canister;
+use crate::lib::root_key::fetch_root_key_if_needed;
 use crate::util::expiry_duration;
 use clap::{App, ArgMatches, Clap, FromArgMatches, IntoApp};
 use tokio::runtime::Runtime;
@@ -32,6 +33,8 @@ pub fn exec(env: &dyn Environment, args: &ArgMatches) -> DfxResult {
 
     let mut runtime = Runtime::new().expect("Unable to create a runtime");
 
+    runtime.block_on(fetch_root_key_if_needed(env))?;
+
     if let Some(canister_name) = opts.canister_name {
         runtime.block_on(create_canister(env, canister_name.as_str(), timeout))?;
         Ok(())

src/dfx/src/commands/canister/delete.rs

@@ -1,6 +1,7 @@
 use crate::lib::environment::Environment;
 use crate::lib::error::{DfxError, DfxResult};
 use crate::lib::models::canister_id_store::CanisterIdStore;
+use crate::lib::root_key::fetch_root_key_if_needed;
 use crate::lib::waiter::waiter_with_timeout;
 use crate::util::expiry_duration;
 use clap::{App, ArgMatches, Clap, FromArgMatches, IntoApp};
@@ -67,6 +68,8 @@ pub fn exec(env: &dyn Environment, args: &ArgMatches) -> DfxResult {
 
     let mut runtime = Runtime::new().expect("Unable to create a runtime");
 
+    runtime.block_on(fetch_root_key_if_needed(env))?;
+
     if let Some(canister_name) = opts.canister_name.as_deref() {
         runtime.block_on(delete_canister(env, &agent, canister_name, timeout))?;
         Ok(())

src/dfx/src/commands/canister/install.rs

@@ -4,6 +4,7 @@ use crate::lib::environment::Environment;
 use crate::lib::error::{DfxError, DfxResult};
 use crate::lib::models::canister_id_store::CanisterIdStore;
 use crate::lib::operations::canister::install_canister;
+use crate::lib::root_key::fetch_root_key_if_needed;
 use crate::util::clap::validators::{compute_allocation_validator, memory_allocation_validator};
 use crate::util::{blob_from_arguments, expiry_duration, get_candid_init_type};
 use clap::{App, ArgMatches, Clap, FromArgMatches, IntoApp};
@@ -99,6 +100,8 @@ pub fn exec(env: &dyn Environment, args: &ArgMatches) -> DfxResult {
 
     let mut runtime = Runtime::new().expect("Unable to create a runtime");
 
+    runtime.block_on(fetch_root_key_if_needed(env))?;
+
     let canister_id_store = CanisterIdStore::for_env(env)?;
 
     if let Some(canister_name) = opts.canister_name.as_deref() {

src/dfx/src/commands/canister/request_status.rs

@@ -1,5 +1,6 @@
 use crate::lib::environment::Environment;
 use crate::lib::error::{DfxError, DfxResult};
+use crate::lib::root_key::fetch_root_key_if_needed;
 use crate::lib::waiter::waiter_with_timeout;
 use crate::util::clap::validators;
 use crate::util::{expiry_duration, print_idl_blob};
@@ -34,6 +35,8 @@ pub fn exec(env: &dyn Environment, args: &ArgMatches) -> DfxResult {
         .ok_or(DfxError::CommandMustBeRunInAProject)?;
     let mut runtime = Runtime::new().expect("Unable to create a runtime");
 
+    runtime.block_on(fetch_root_key_if_needed(env))?;
+
     let timeout = expiry_duration();
 
     let mut waiter = waiter_with_timeout(timeout);

src/dfx/src/commands/canister/set_controller.rs

@@ -2,6 +2,7 @@ use crate::lib::environment::Environment;
 use crate::lib::error::{DfxError, DfxResult};
 use crate::lib::identity::identity_manager::IdentityManager;
 use crate::lib::models::canister_id_store::CanisterIdStore;
+use crate::lib::root_key::fetch_root_key_if_needed;
 use crate::lib::waiter::waiter_with_timeout;
 use crate::util::expiry_duration;
 use clap::{App, ArgMatches, Clap, FromArgMatches, IntoApp};
@@ -49,6 +50,7 @@ pub fn exec(env: &dyn Environment, args: &ArgMatches) -> DfxResult {
     );
 
     let mut runtime = Runtime::new().expect("Unable to create a runtime");
+    runtime.block_on(fetch_root_key_if_needed(env))?;
     runtime.block_on(
         mgr.set_controller(&canister_id, &controller_principal)
             .call_and_wait(waiter_with_timeout(timeout)),

src/dfx/src/commands/canister/start.rs

@@ -1,6 +1,7 @@
 use crate::lib::environment::Environment;
 use crate::lib::error::{DfxError, DfxResult};
 use crate::lib::models::canister_id_store::CanisterIdStore;
+use crate::lib::root_key::fetch_root_key_if_needed;
 use crate::lib::waiter::waiter_with_timeout;
 use crate::util::expiry_duration;
 use clap::{App, ArgMatches, Clap, FromArgMatches, IntoApp};
@@ -64,6 +65,8 @@ pub fn exec(env: &dyn Environment, args: &ArgMatches) -> DfxResult {
 
     let mut runtime = Runtime::new().expect("Unable to create a runtime");
 
+    runtime.block_on(fetch_root_key_if_needed(env))?;
+
     let timeout = expiry_duration();
 
     if let Some(canister_name) = opts.canister_name.as_deref() {

src/dfx/src/commands/canister/status.rs

@@ -1,6 +1,7 @@
 use crate::lib::environment::Environment;
 use crate::lib::error::{DfxError, DfxResult};
 use crate::lib::models::canister_id_store::CanisterIdStore;
+use crate::lib::root_key::fetch_root_key_if_needed;
 use crate::lib::waiter::waiter_with_timeout;
 use crate::util::expiry_duration;
 use clap::{App, ArgMatches, Clap, FromArgMatches, IntoApp};
@@ -59,6 +60,8 @@ pub fn exec(env: &dyn Environment, args: &ArgMatches) -> DfxResult {
 
     let mut runtime = Runtime::new().expect("Unable to create a runtime");
 
+    runtime.block_on(fetch_root_key_if_needed(env))?;
+
     let timeout = expiry_duration();
 
     if let Some(canister_name) = opts.canister_name.as_deref() {

src/dfx/src/commands/canister/stop.rs

@@ -1,6 +1,7 @@
 use crate::lib::environment::Environment;
 use crate::lib::error::{DfxError, DfxResult};
 use crate::lib::models::canister_id_store::CanisterIdStore;
+use crate::lib::root_key::fetch_root_key_if_needed;
 use crate::lib::waiter::waiter_with_timeout;
 use crate::util::expiry_duration;
 use clap::{App, ArgMatches, Clap, FromArgMatches, IntoApp};
@@ -63,6 +64,8 @@ pub fn exec(env: &dyn Environment, args: &ArgMatches) -> DfxResult {
         .ok_or(DfxError::CommandMustBeRunInAProject)?;
 
     let mut runtime = Runtime::new().expect("Unable to create a runtime");
+    runtime.block_on(fetch_root_key_if_needed(env))?;
+
     let timeout = expiry_duration();
 
     if let Some(canister_name) = opts.canister_name.as_deref() {

src/dfx/src/commands/deploy.rs

@@ -2,6 +2,7 @@ use crate::lib::environment::Environment;
 use crate::lib::error::DfxResult;
 use crate::lib::operations::canister::deploy_canisters;
 use crate::lib::provider::create_agent_environment;
+use crate::lib::root_key::fetch_root_key_if_needed;
 use crate::util::expiry_duration;
 use clap::{App, ArgMatches, Clap, FromArgMatches, IntoApp};
 use tokio::runtime::Runtime;
@@ -41,6 +42,7 @@ pub fn exec(env: &dyn Environment, args: &ArgMatches) -> DfxResult {
     let argument_type = opts.argument_type.as_deref();
 
     let mut runtime = Runtime::new().expect("Unable to create a runtime");
+    runtime.block_on(fetch_root_key_if_needed(&env))?;
 
     runtime.block_on(deploy_canisters(
         &env,

src/dfx/src/lib/mod.rs

@@ -14,5 +14,6 @@ pub mod package_arguments;
 pub mod progress_bar;
 pub mod provider;
 pub mod replica_config;
+pub mod root_key;
 pub mod waiter;
 pub mod webserver;