chore: skip delegation range check. refactor UpdateCallRejectedError …

…throw
dfinity · Oct 18, 2024 · db92356 · db92356
1 parent edf0e51
commit db92356
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 33 deletions.
diff --git a/packages/agent/src/actor.ts b/packages/agent/src/actor.ts
@@ -1,23 +1,24 @@
-import { Buffer } from 'buffer/';
+import { Buffer } from "buffer/";
 import {
   Agent,
   getDefaultAgent,
   HttpDetailsResponse,
   QueryResponseRejected,
   QueryResponseStatus,
   ReplicaRejectCode,
-  SubmitResponse, v2ResponseBody,
+  SubmitResponse,
+  v2ResponseBody,
   v3ResponseBody,
 } from "./agent";
-import { AgentError } from './errors';
-import { bufFromBufLike, IDL } from '@dfinity/candid';
-import { pollForResponse, PollStrategyFactory, strategy } from './polling';
-import { Principal } from '@dfinity/principal';
-import { RequestId } from './request_id';
-import { toHex } from './utils/buffer';
-import { Certificate, CreateCertificateOptions, lookupResultToBuffer } from './certificate';
-import managementCanisterIdl from './canisters/management_idl';
-import _SERVICE, { canister_install_mode, canister_settings } from './canisters/management_service';
+import { AgentError } from "./errors";
+import { bufFromBufLike, IDL } from "@dfinity/candid";
+import { pollForResponse, PollStrategyFactory, strategy } from "./polling";
+import { Principal } from "@dfinity/principal";
+import { RequestId } from "./request_id";
+import { toHex } from "./utils/buffer";
+import { Certificate, CreateCertificateOptions, lookupResultToBuffer } from "./certificate";
+import managementCanisterIdl from "./canisters/management_idl";
+import _SERVICE, { canister_install_mode, canister_settings } from "./canisters/management_service";
 
 export class ActorCallError extends AgentError {
   constructor(
@@ -581,10 +582,8 @@ function _createActorMethod(
             );
           }
         }
-      }
-
-      // handle v2 response errors by throwing an UpdateCallRejectedError object
-      if (!response.ok || response.body /* IC-1462 */) {
+      } else if (!response.ok || response.body /* IC-1462 */) {
+        // handle v2 response errors by throwing an UpdateCallRejectedError object
         const { reject_code, reject_message, error_code } = response.body as v2ResponseBody;
         throw new UpdateCallRejectedError(cid,
           methodName,

diff --git a/packages/agent/src/certificate.ts b/packages/agent/src/certificate.ts
@@ -1,10 +1,10 @@
-import * as cbor from './cbor';
-import { AgentError } from './errors';
-import { hash } from './request_id';
-import { bufEquals, concat, fromHex, toHex } from './utils/buffer';
-import { Principal } from '@dfinity/principal';
-import * as bls from './utils/bls';
-import { decodeTime } from './utils/leb';
+import * as cbor from "./cbor";
+import { AgentError } from "./errors";
+import { hash } from "./request_id";
+import { bufEquals, concat, fromHex, toHex } from "./utils/buffer";
+import { Principal } from "@dfinity/principal";
+import * as bls from "./utils/bls";
+import { decodeTime } from "./utils/leb";
 import { MANAGEMENT_CANISTER_ID } from "./agent";
 
 /**
@@ -272,17 +272,19 @@ export class Certificate {
 
     await cert.verify();
 
-    const canisterInRange = check_canister_ranges({
-      canisterId: this._canisterId,
-      subnetId: Principal.fromUint8Array(new Uint8Array(d.subnet_id)),
-      tree: cert.cert.tree,
-    });
-    if (!canisterInRange) {
-      throw new CertificateVerificationError(
-        `Canister ${this._canisterId} not in range of delegations for subnet 0x${toHex(
-          d.subnet_id,
-        )}`,
-      );
+    if (this._canisterId.toString() !== MANAGEMENT_CANISTER_ID) {
+      const canisterInRange = check_canister_ranges({
+        canisterId: this._canisterId,
+        subnetId: Principal.fromUint8Array(new Uint8Array(d.subnet_id)),
+        tree: cert.cert.tree,
+      });
+      if (!canisterInRange) {
+        throw new CertificateVerificationError(
+          `Canister ${this._canisterId} not in range of delegations for subnet 0x${toHex(
+            d.subnet_id,
+          )}`,
+        );
+      }
     }
     const publicKeyLookup = lookupResultToBuffer(
       cert.lookup(['subnet', d.subnet_id, 'public_key']),