Skip to content

Commit

Permalink
chore: release ic(x)-asset v0.21.0 (#3920)
Browse files Browse the repository at this point in the history
* chore: release icx-asset v0.21.0

* also release ic-asset

* dfx-core 0.1.0

* agent-rs 0.38.0

* fill dfx-core manifest

* dependencies must be versioned

* large artificial-delay then call return request ID

* cont.
  • Loading branch information
lwshang authored Sep 23, 2024
1 parent babc9db commit 69940b2
Show file tree
Hide file tree
Showing 11 changed files with 51 additions and 38 deletions.
34 changes: 19 additions & 15 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ license = "Apache-2.0"
[workspace.dependencies]
candid = "0.10.4"
candid_parser = "0.1.4"
ic-agent = { git = "https://github.com/dfinity/agent-rs.git", rev = "6e11a350112f9b907c4d590d8217f340e153d898" }
ic-asset = { path = "src/canisters/frontend/ic-asset" }
dfx-core = { path = "src/dfx-core", version = "0.1.0" }
ic-agent = "0.38"
ic-asset = { path = "src/canisters/frontend/ic-asset", version = "0.21.0" }
ic-cdk = "0.13.1"
ic-identity-hsm = { git = "https://github.com/dfinity/agent-rs.git", rev = "6e11a350112f9b907c4d590d8217f340e153d898" }
ic-utils = { git = "https://github.com/dfinity/agent-rs.git", rev = "6e11a350112f9b907c4d590d8217f340e153d898" }
ic-identity-hsm = "0.38"
ic-utils = "0.38"

aes-gcm = "0.10.3"
anyhow = "1.0.56"
Expand Down
12 changes: 6 additions & 6 deletions e2e/tests-dfx/basic-project.bash
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ teardown() {
@test "build + install + call + request-status -- greet_mo" {
dfx_new hello
install_asset greet
dfx_start
dfx canister create --all
dfx build
dfx_start --artificial-delay 10000
dfx canister create hello_backend
dfx build hello_backend
# INSTALL_REQUEST_ID=$(dfx canister install hello_backend --async)
# dfx canister request-status $INSTALL_REQUEST_ID
dfx canister install hello_backend
Expand Down Expand Up @@ -57,9 +57,9 @@ teardown() {
@test "build + install + call + request-status -- counter_mo" {
dfx_new hello
install_asset counter
dfx_start
dfx canister create --all
dfx build
dfx_start --artificial-delay 10000
dfx canister create hello_backend
dfx build hello_backend
dfx canister install hello_backend

assert_command dfx canister call hello_backend read
Expand Down
6 changes: 3 additions & 3 deletions e2e/tests-dfx/request_status.bash
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ teardown() {

@test "request-status output raw" {
install_asset greet
dfx_start
dfx canister create --all
dfx build
dfx_start --artificial-delay 10000
dfx canister create hello_backend
dfx build hello_backend

dfx canister install hello_backend

Expand Down
4 changes: 2 additions & 2 deletions src/canisters/frontend/ic-asset/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ic-asset"
version = "0.20.0"
version = "0.21.0"
authors.workspace = true
edition.workspace = true
repository.workspace = true
Expand All @@ -16,7 +16,7 @@ backoff.workspace = true
brotli = "6.0.0"
candid = { workspace = true }
derivative = "2.2.0"
dfx-core = { path = "../../../dfx-core" }
dfx-core.workspace = true
flate2.workspace = true
futures.workspace = true
futures-intrusive = "0.4.0"
Expand Down
2 changes: 1 addition & 1 deletion src/canisters/frontend/icx-asset/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "icx-asset"
version = "0.20.0"
version = "0.21.0"
authors.workspace = true
edition.workspace = true
repository.workspace = true
Expand Down
5 changes: 4 additions & 1 deletion src/dfx-core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
[package]
name = "dfx-core"
version = "0.0.1"
version = "0.1.0"
authors.workspace = true
edition.workspace = true
repository.workspace = true
license.workspace = true
rust-version.workspace = true
description = "dfx core library"
documentation = "https://docs.rs/dfx-core"
keywords = ["internet-computer", "icp", "dfinity"]

[dependencies]
aes-gcm.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion src/dfx/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ console = "0.15.0"
crc32fast = "1.3.2"
crossbeam = "0.8.1"
ctrlc = { version = "3.2.1", features = ["termination"] }
dfx-core = { path = "../dfx-core" }
dfx-core.workspace = true
dialoguer = { workspace = true, features = ["fuzzy-select"] }
directories-next.workspace = true
flate2 = { workspace = true, default-features = false, features = ["zlib-ng"] }
Expand Down
2 changes: 1 addition & 1 deletion src/dfx/src/commands/canister/create.rs
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ pub async fn exec(
)
.with_context(|| format!("Failed to read Wasm memory limit of {canister_name}."))?;
let log_visibility = get_log_visibility(
opts.log_visibility,
opts.log_visibility.clone(),
Some(config_interface),
Some(canister_name),
)
Expand Down
9 changes: 7 additions & 2 deletions src/dfx/src/commands/canister/status.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,13 @@ async fn canister_status(
"Not Set".to_string()
};
let log_visibility = match status.settings.log_visibility {
LogVisibility::Controllers => "controllers",
LogVisibility::Public => "public",
LogVisibility::Controllers => "controllers".to_string(),
LogVisibility::Public => "public".to_string(),
LogVisibility::AllowedViewers(viewers) => {
let mut viewers: Vec<_> = viewers.iter().map(Principal::to_text).collect();
viewers.sort();
format!("allowed viewers: {}", viewers.join(", "))
}
};

println!("Canister status call result for {canister}.\nStatus: {status}\nControllers: {controllers}\nMemory allocation: {memory_allocation}\nCompute allocation: {compute_allocation}\nFreezing threshold: {freezing_threshold}\nMemory Size: {memory_size:?}\nBalance: {balance} Cycles\nReserved: {reserved} Cycles\nReserved cycles limit: {reserved_cycles_limit}\nWasm memory limit: {wasm_memory_limit}\nModule hash: {module_hash}\nNumber of queries: {queries_total}\nInstructions spent in queries: {query_instructions_total}\nTotal query request payload size (bytes): {query_req_payload_total}\nTotal query response payload size (bytes): {query_resp_payload_total}\nLog visibility: {log_visibility}",
Expand Down
4 changes: 2 additions & 2 deletions src/dfx/src/commands/canister/update_settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ pub async fn exec(
let wasm_memory_limit =
get_wasm_memory_limit(opts.wasm_memory_limit, config_interface, canister_name)?;
let log_visibility =
get_log_visibility(opts.log_visibility, config_interface, canister_name)?;
get_log_visibility(opts.log_visibility.clone(), config_interface, canister_name)?;
if let Some(added) = &opts.add_controller {
let status = get_canister_status(env, canister_id, call_sender).await?;
let mut existing_controllers = status.settings.controllers;
Expand Down Expand Up @@ -241,7 +241,7 @@ pub async fn exec(
)
.with_context(|| format!("Failed to get Wasm memory limit for {canister_name}."))?;
let log_visibility = get_log_visibility(
opts.log_visibility,
opts.log_visibility.clone(),
Some(config_interface),
Some(canister_name),
)
Expand Down

0 comments on commit 69940b2

Please sign in to comment.