Merge branch 'main' into next

dfinity · Dec 4, 2024 · 605abca · 605abca
2 parents a061429 + b3090c3
commit 605abca
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ concurrency:
 jobs:
   build:
     name: cargo build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -43,7 +43,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-13-large]
+        os: [ubuntu-24.04, macos-13-large]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -71,7 +71,7 @@ jobs:
 
   fmt:
     name: cargo fmt
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -94,7 +94,7 @@ jobs:
 
   clippy:
     name: cargo clippy
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -117,7 +117,7 @@ jobs:
 
   doc:
     name: cargo doc
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -142,7 +142,7 @@ jobs:
     name: ci:required
     if: ${{ always() }}
     needs: [build, test, fmt, clippy, doc]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: check build result
         if: ${{ needs.build.result != 'success' }}

diff --git a/.github/workflows/conventional-commits.yml b/.github/workflows/conventional-commits.yml
@@ -15,7 +15,7 @@ concurrency:
 jobs:
   check:
     name: conventional-pr-title:required
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       # Conventional commit patterns:
       #   verb: description

diff --git a/e2e-tests/Cargo.toml b/e2e-tests/Cargo.toml
@@ -21,4 +21,4 @@ sha2.workspace = true
 
 [dev-dependencies]
 hex.workspace = true
-pocket-ic = { git = "https://github.com/dfinity/ic", tag = "release-2024-09-26_01-31-base" }
+pocket-ic = { git = "https://github.com/dfinity/ic", tag = "release-2024-11-28_03-15-base" }
diff --git a/e2e-tests/src/bin/call_struct.rs b/e2e-tests/src/bin/call_struct.rs
@@ -6,7 +6,7 @@ use ic_cdk::prelude::*;
 async fn create_canister_via_struct() -> Principal {
     let res: (CanisterIdRecord,) = Call::new(Principal::management_canister(), "create_canister")
         .with_args((CreateCanisterArgument::default(),))
-        .with_cycles(200_000_000_000)
+        .with_cycles(1_000_000_000_000)
         .with_guaranteed_response()
         .call()
         .await

diff --git a/e2e-tests/src/bin/chunk.rs b/e2e-tests/src/bin/chunk.rs
@@ -10,7 +10,7 @@ use ic_cdk::update;
 async fn call_create_canister() -> Principal {
     let arg = CreateCanisterArgument::default();
 
-    create_canister(arg, 200_000_000_000u128)
+    create_canister(arg, 1_000_000_000_000u128)
         .await
         .unwrap()
         .0

diff --git a/e2e-tests/src/bin/management_caller.rs b/e2e-tests/src/bin/management_caller.rs
@@ -5,6 +5,7 @@ use ic_cdk::prelude::*;
 /// - chunk.rs
 mod main {
     use super::*;
+    use candid::Principal;
     use ic_cdk::api::management_canister::main::*;
     #[update]
     async fn execute_main_methods() {
@@ -73,6 +74,13 @@ mod main {
         let response = raw_rand().await.unwrap().0;
         assert_eq!(response.len(), 32);
     }
+
+    #[update]
+    async fn execute_subnet_info(subnet_id: Principal) {
+        let arg = SubnetInfoArgs { subnet_id };
+        let response = subnet_info(arg).await.unwrap().0;
+        assert!(!response.replica_version.is_empty());
+    }
 }
 
 mod provisional {

diff --git a/ic-cdk/CHANGELOG.md b/ic-cdk/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+### Added
+
+- Support management canister method: `subnet_info`. (#532)
+  - Add types: `SubnetInfoArgs` and `SubnetInfoResult`.
+
 ### Fixed
 
 - Fix update/query macro could not handle function arguments with the same name as the function itself. (#525)

diff --git a/scripts/download_pocket_ic.sh b/scripts/download_pocket_ic.sh
@@ -9,7 +9,7 @@ cd "$SCRIPTS_DIR/../e2e-tests"
 uname_sys=$(uname -s | tr '[:upper:]' '[:lower:]')
 echo "uname_sys: $uname_sys"
 
-tag="release-2024-09-26_01-31-base"
+tag="release-2024-11-28_03-15-base"
 
 curl -sL "https://github.com/dfinity/ic/releases/download/$tag/pocket-ic-x86_64-$uname_sys.gz" --output pocket-ic.gz
 gzip -df pocket-ic.gz