Merge remote-tracking branch 'origin/master' into icx-proxy-dev

dfinity · Sep 8, 2023 · 25affd4 · 25affd4
2 parents 04ff1f5 + 66085c4
commit 25affd4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/.github/workflows/update-replica-version.yml b/.github/workflows/update-replica-version.yml
@@ -68,10 +68,10 @@ jobs:
         git config committer.name "GitHub Actions Bot"
         git config user.email "${{ github.event.sender.id }}+${{ github.event.sender.login }}@users.noreply.github.com"
         git config user.name "${{ github.event.sender.login }}"
-        git checkout -b chore-update-replica-${{ env.REPLICA_VERSION }} 
+        git checkout -b chore-update-replica-${{ env.REPLICA_VERSION }}-${{ github.event.inputs.sdkBranch }}
         git add .
         git commit -m "chore: update replica version to ${{ env.REPLICA_VERSION }}"
-        git push origin chore-update-replica-${{ env.REPLICA_VERSION }} 
+        git push origin chore-update-replica-${{ env.REPLICA_VERSION }}-${{ github.event.inputs.sdkBranch }}
       
     - name: create Pull Request, with CHANGELOG.md entry suggestion 
       uses: actions/github-script@v6
@@ -113,10 +113,10 @@ jobs:
             title: `chore: update replica version to ${new_replica_sha__short}`,
             owner,
             repo,
-            head: 'chore-update-replica-${{ env.REPLICA_VERSION }}',
+            head: 'chore-update-replica-${{ env.REPLICA_VERSION }}-${{ github.event.inputs.sdkBranch }}',
             base: '${{ github.event.inputs.sdkBranch }}',
             body: [
-              `## Suggested [CHANGELOG.md](https://github.com/${owner}/${repo}/edit/chore-update-replica-${{ env.REPLICA_VERSION }}/CHANGELOG.md) changes`,
+              `## Suggested [CHANGELOG.md](https://github.com/${owner}/${repo}/edit/chore-update-replica-${{ env.REPLICA_VERSION }}-${{ github.event.inputs.sdkBranch }}/CHANGELOG.md) changes`,
               '```',
               '## Dependencies',
               '',

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 # UNRELEASED
 
+### feat: Updated handling of missing values in state tree certificates
+
+The `Unknown` lookup of a path in a certificate results in an `AgentError` (the IC returns `Absent` for non-existing paths).
+
 ### fix: dfx deploy urls printed for asset canisters
 
 ### chore: --emulator parameter is deprecated and will be discontinued soon

diff --git a/nix/sources.json b/nix/sources.json
@@ -6,10 +6,10 @@
         "homepage": "https://rustsec.org",
         "owner": "RustSec",
         "repo": "advisory-db",
-        "rev": "370cdc73f5332995b61e2dd281f170b41df44319",
-        "sha256": "17rk04rxfqiqqsz7aw2f4abfm2wls70rgy22smm7mhm1di7lba6a",
+        "rev": "0fcce3f7cbbc76da50ab0d778399bf85dc141834",
+        "sha256": "1mpmxdhdyh2cjgdwppk0spj252hw02xisc3gs43hxim6yd7565gi",
         "type": "tarball",
-        "url": "https://github.com/RustSec/advisory-db/archive/370cdc73f5332995b61e2dd281f170b41df44319.tar.gz",
+        "url": "https://github.com/RustSec/advisory-db/archive/0fcce3f7cbbc76da50ab0d778399bf85dc141834.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "canister_sandbox-x86_64-darwin": {

diff --git a/src/dfx/src/lib/state_tree/canister_info.rs b/src/dfx/src/lib/state_tree/canister_info.rs
@@ -12,7 +12,7 @@ pub async fn read_state_tree_canister_controllers(
         .read_state_canister_info(canister_id, "controllers")
         .await
     {
-        Err(AgentError::LookupPathUnknown(_) | AgentError::LookupPathAbsent(_)) => {
+        Err(AgentError::LookupPathAbsent(_)) => {
             return Ok(None);
         }
         r => r.with_context(|| format!("Failed to read controllers of canister {canister_id}."))?,
@@ -57,10 +57,7 @@ pub async fn read_state_tree_canister_module_hash(
         .await
     {
         Ok(blob) => Some(blob),
-        // If the canister is empty, this path does not exist.
-        // The replica doesn't support negative lookups, therefore if the canister
-        // is empty, the replica will return lookup_path([], Pruned _) = Unknown
-        Err(AgentError::LookupPathUnknown(_)) | Err(AgentError::LookupPathAbsent(_)) => None,
+        Err(AgentError::LookupPathAbsent(_)) => None,
         Err(x) => bail!(x),
     };