working build

Author: krpeacock

packages/agent/src/actor.ts

@@ -14,7 +14,6 @@ import { pollForResponse, PollStrategyFactory, strategy } from './polling';
 import { Principal } from '@dfinity/principal';
 import { RequestId } from './request_id';
 import { toHex } from './utils/buffer';
-import { CreateCertificateOptions } from './certificate';
 import managementCanisterIdl from './canisters/management_idl';
 import _SERVICE from './canisters/management_service';
 
@@ -130,11 +129,6 @@ export interface ActorConfig extends CallConfig {
     args: unknown[],
     callConfig: CallConfig,
   ): Partial<CallConfig> | void;
-
-  /**
-   * Polyfill for BLS Certificate verification in case wasm is not supported
-   */
-  blsVerify?: CreateCertificateOptions['blsVerify'];
 }
 
 // TODO: move this to proper typing when Candid support TypeScript.
@@ -308,7 +302,7 @@ export class Actor {
             func.annotations.push(ACTOR_METHOD_WITH_HTTP_DETAILS);
           }
 
-          this[methodName] = _createActorMethod(this, methodName, func, config.blsVerify);
+          this[methodName] = _createActorMethod(this, methodName, func);
         }
       }
     }
@@ -369,12 +363,7 @@ export type ActorConstructor = new (config: ActorConfig) => ActorSubclass;
 
 export const ACTOR_METHOD_WITH_HTTP_DETAILS = 'http-details';
 
-function _createActorMethod(
-  actor: Actor,
-  methodName: string,
-  func: IDL.FuncClass,
-  blsVerify?: CreateCertificateOptions['blsVerify'],
-): ActorMethod {
+function _createActorMethod(actor: Actor, methodName: string, func: IDL.FuncClass): ActorMethod {
   let caller: (options: CallConfig, ...args: unknown[]) => Promise<unknown>;
   if (func.annotations.includes('query') || func.annotations.includes('composite_query')) {
     caller = async (options, ...args) => {
@@ -437,7 +426,7 @@ function _createActorMethod(
       }
 
       const pollStrategy = pollingStrategyFactory();
-      const responseBytes = await pollForResponse(agent, ecid, requestId, pollStrategy, blsVerify);
+      const responseBytes = await pollForResponse(agent, ecid, requestId, pollStrategy);
       const shouldIncludeHttpDetails = func.annotations.includes(ACTOR_METHOD_WITH_HTTP_DETAILS);
 
       if (responseBytes !== undefined) {

packages/agent/src/canisterStatus/index.ts

@@ -90,7 +90,6 @@ export type CanisterStatusOptions = {
   canisterId: Principal;
   agent: HttpAgent;
   paths?: Path[] | Set<Path>;
-  blsVerify?: CreateCertificateOptions['blsVerify'];
 };
 
 /**

packages/agent/src/certificate.ts

@@ -3,7 +3,7 @@ import { AgentError } from './errors';
 import { hash } from './request_id';
 import { concat, fromHex, toHex } from './utils/buffer';
 import { Principal } from '@dfinity/principal';
-import * as bls from './utils/bls';
+import { blsVerify } from '@dfinity/bls-verify';
 import { decodeTime } from './utils/leb';
 
 /**
@@ -170,15 +170,10 @@ export class Certificate {
    * @throws {CertificateVerificationError}
    */
   public static async create(options: CreateCertificateOptions): Promise<Certificate> {
-    let blsVerify = options.blsVerify;
-    if (!blsVerify) {
-      blsVerify = bls.blsVerify;
-    }
     const cert = new Certificate(
       options.certificate,
       options.rootKey,
       options.canisterId,
-      blsVerify,
       options.maxAgeInMinutes,
     );
 
@@ -190,8 +185,6 @@ export class Certificate {
     certificate: ArrayBuffer,
     private _rootKey: ArrayBuffer,
     private _canisterId: Principal,
-    private _blsVerify: VerifyFunc,
-    // Default to 5 minutes
     private _maxAgeInMinutes: number = 5,
   ) {
     this.cert = cbor.decode(new Uint8Array(certificate));
@@ -245,7 +238,7 @@ export class Certificate {
     }
 
     try {
-      sigVer = await this._blsVerify(new Uint8Array(key), new Uint8Array(sig), new Uint8Array(msg));
+      sigVer = await blsVerify(new Uint8Array(key), new Uint8Array(sig), new Uint8Array(msg));
     } catch (err) {
       sigVer = false;
     }
@@ -263,7 +256,6 @@ export class Certificate {
       certificate: d.certificate,
       rootKey: this._rootKey,
       canisterId: this._canisterId,
-      blsVerify: this._blsVerify,
       // Do not check max age for delegation certificates
       maxAgeInMinutes: Infinity,
     });

packages/agent/src/index.ts

@@ -11,7 +11,6 @@ export * from './der';
 export * from './fetch_candid';
 export * from './public_key';
 export * from './request_id';
-export * from './utils/bls';
 export * from './utils/buffer';
 export * from './utils/random';
 export * as polling from './polling';

packages/agent/src/polling/index.ts

@@ -29,7 +29,6 @@ export async function pollForResponse(
   strategy: PollStrategy,
   // eslint-disable-next-line
   request?: any,
-  blsVerify?: CreateCertificateOptions['blsVerify'],
 ): Promise<ArrayBuffer> {
   const path = [new TextEncoder().encode('request_status'), requestId];
   const currentRequest = request ?? (await agent.createReadStateRequest?.({ paths: [path] }));
@@ -39,7 +38,6 @@ export async function pollForResponse(
     certificate: state.certificate,
     rootKey: agent.rootKey,
     canisterId: canisterId,
-    blsVerify,
   });
   const maybeBuf = cert.lookup([...path, new TextEncoder().encode('status')]);
   let status;

packages/agent/src/utils/bls.test.ts

@@ -20,11 +20,4 @@ npm i --save @dfinity/bls-verify
 
 ```ts
 import { blsVerify } from '@dfinity/bls-verify';
-import { createActor, canisterId } from '../declarations/example';
-
-const exampleActor = createActor(canisterId, {
-  actorOptions: {
-    blsVerify,
-  },
-});
 ```

packages/agent/src/utils/bls.ts

@@ -13,7 +13,6 @@
   "bugs": {
     "url": "https://github.com/dfinity/agent-js/issues"
   },
-  "type": "module",
   "keywords": [
     "internet computer",
     "ic",

packages/bls-verify/README.md

@@ -33,7 +33,6 @@ test('delegation works for canisters within the subnet range', async () => {
         certificate: fromHex(SAMPLE_CERT),
         rootKey: fromHex(IC_ROOT_KEY),
         canisterId: canisterId,
-        blsVerify,
       }),
     ).resolves.not.toThrow();
   }