feat: ECDSAKeyIdentity

.github/workflows/e2e-tests.yml

@@ -31,7 +31,6 @@ jobs:
       - run: npm install -g npm
 
       - run: npm install
-      - run: npm run lint --workspaces --if-present
 
       # build monorepo incl. each subpackage
       - run: npm run build --workspaces --if-present
@@ -47,3 +46,13 @@ jobs:
         env:
           CI: true
           REPLICA_PORT: 8000
+
+  aggregate:
+    name: e2e:required
+    if: ${{ always() }}
+    needs: [ test ]
+    runs-on: ubuntu-latest
+    steps:
+      - name: check e2e test result
+        if: ${{ needs.test.result != 'success' }}
+        run: exit 1

.github/workflows/lint.yml

@@ -0,0 +1,30 @@
+name: Check Lint
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - edited
+      - synchronize
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [ubuntu-18.04]
+        ghc: ['8.8.4']
+        spec:
+          - release-0.16 # https://github.com/dfinity-lab/ic-ref/tree/release-0.16
+        node:
+          - 14
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node }}
+      - run: npm install -g npm
+      - run: npm install
+      - run: npm run lint --workspaces --if-present

.github/workflows/mitm.yml

@@ -63,3 +63,13 @@ jobs:
           REPLICA_PORT: 8888
           MITM: true
         run: npm run mitm --workspaces --if-present
+
+  aggregate:
+    name: mitm:required
+    if: ${{ always() }}
+    needs: [ test ]
+    runs-on: ubuntu-latest
+    steps:
+      - name: check e2e test result
+        if: ${{ needs.test.result != 'success' }}
+        run: exit 1

.github/workflows/prettier.yml

@@ -28,3 +28,13 @@ jobs:
       - run: npm install -g npm
       - run: npm install prettier pretty-quick
       - run: npm run prettier:check
+
+  aggregate:
+    name: format:required
+    if: ${{ always() }}
+    needs: [ test ]
+    runs-on: ubuntu-latest
+    steps:
+      - name: check e2e test result
+        if: ${{ needs.test.result != 'success' }}
+        run: exit 1

.github/workflows/unit-tests.yml

@@ -33,7 +33,6 @@ jobs:
       - run: npm install -g npm
 
       - run: npm install
-      - run: npm run lint --workspaces --if-present
 
       # build monorepo incl. each subpackage
       - run: npm run build --workspaces --if-present
@@ -42,3 +41,13 @@ jobs:
       - run: npm run test
         env:
           CI: true
+
+  aggregate:
+    name: unit:required
+    if: ${{ always() }}
+    needs: [ test ]
+    runs-on: ubuntu-latest
+    steps:
+      - name: check e2e test result
+        if: ${{ needs.test.result != 'success' }}
+        run: exit 1

demos/ledgerhq/package.json

@@ -2,18 +2,19 @@
   "name": "ic-agent-ledgerhq-app",
   "private": true,
   "dependencies": {
-    "@dfinity/agent": "^0.12.0",
-    "@dfinity/authentication": "^0.12.0",
-    "@dfinity/identity": "^0.12.0",
-    "@dfinity/identity-ledgerhq": "^0.12.0",
-    "@dfinity/principal": "^0.12.0",
+    "@dfinity/agent": "^0.12.1",
+    "@dfinity/authentication": "^0.12.1",
+    "@dfinity/identity": "^0.12.1",
+    "@dfinity/identity-ledgerhq": "^0.12.1",
+    "@dfinity/principal": "^0.12.1",
     "assert": "^2.0.0",
     "buffer": "^6.0.3",
     "events": "^3.2.0",
     "html-webpack-plugin": "^5.1.0",
     "process": "^0.11.10",
     "protobufjs": "^6.10.2",
     "stream-browserify": "^3.0.0",
+    "ts-node": "^10.8.2",
     "util": "^0.12.3",
     "webpack": "^5.24.1",
     "webpack-cli": "^4.5.0",
@@ -27,5 +28,5 @@
     "test:coverage": "",
     "test": ""
   },
-  "version": "0.12.0"
+  "version": "0.12.1"
 }

demos/sample-javascript/package.json

@@ -2,15 +2,16 @@
   "name": "ic-agent-sample-javascript-app",
   "private": true,
   "dependencies": {
-    "@dfinity/agent": "^0.12.0",
-    "@dfinity/authentication": "^0.12.0",
-    "@dfinity/identity": "^0.12.0",
-    "@dfinity/principal": "^0.12.0",
+    "@dfinity/agent": "^0.12.1",
+    "@dfinity/authentication": "^0.12.1",
+    "@dfinity/identity": "^0.12.1",
+    "@dfinity/principal": "^0.12.1",
     "assert": "^2.0.0",
     "events": "^3.2.0",
     "html-webpack-plugin": "^5.1.0",
     "process": "^0.11.10",
     "stream-browserify": "^3.0.0",
+    "ts-node": "^10.8.2",
     "util": "^0.12.3",
     "webpack": "^5.24.1",
     "webpack-cli": "^4.5.0",
@@ -24,5 +25,5 @@
     "test:coverage": "",
     "test": ""
   },
-  "version": "0.12.0"
+  "version": "0.12.1"
 }

docs/generated/changelog.html

@@ -10,8 +10,19 @@
     <h1>Agent-JS Changelog</h1>
 
     <section>
+      <h2>Version 0.12.2</h2>
+      <ul>
+        <li>
+          Support for the SubtleCrypto interface in @dfinity/identity using the new ECDSAKeyIdentity
+        </li>
+      </ul>
       <h2>Version 0.12.1</h2>
       <ul>
+        <li>Adds inline sourcemaps to packages</li>
+        <li>
+          Pulls lint out to a separate job now that Node 12 is failing with latest eslint
+          dependencies
+        </li>
         <li>Adds UTF-8 as an encoding option for CanisterStatus custom paths</li>
         <li>
           Adds a public method "createReadStateRequest" that creates the request for "readState".

e2e/browser/.gitignore

@@ -0,0 +1,2 @@
+.parcel-cache
+src/declarations

e2e/browser/.proxyrc

@@ -0,0 +1,5 @@
+{
+  "/api": {
+    "target": "http://localhost:8000/",
+  }
+}

e2e/browser/cypress.config.js

@@ -0,0 +1,12 @@
+/* eslint-disable no-undef */
+/* eslint-disable @typescript-eslint/no-var-requires */
+const { defineConfig } = require('cypress');
+
+module.exports = defineConfig({
+  video: false,
+  e2e: {
+    setupNodeEvents(on, config) {
+      // implement node event listeners here
+    },
+  },
+});

e2e/browser/cypress/.eslintrc.json

@@ -0,0 +1,6 @@
+{
+  "plugins": ["cypress"],
+  "env": {
+    "cypress/globals": true
+  }
+}

e2e/browser/cypress/e2e/ecdsa.cy.js

@@ -0,0 +1,44 @@
+import { ECDSAKeyIdentity } from '@dfinity/identity';
+import { get, set } from 'idb-keyval';
+import { createActor } from '../utils/actor';
+import ids from '../../.dfx/local/canister_ids.json';
+const canisterId = ids.whoami.local;
+
+const setup = async () => {
+  const identity1 = await ECDSAKeyIdentity.generate();
+  const whoami1 = createActor(ids.whoami.local, { agentOptions: { identity: identity1 } });
+
+  const principal1 = await whoami1.whoami();
+
+  return { principal1, whoami1, identity1 };
+};
+
+describe('ECDSAKeyIdentity tests with SubtleCrypto', () => {
+  it('generates a new identity', () => {
+    cy.visit('http://localhost:1234');
+    cy.window().then(async window => {
+      const { principal1 } = await setup();
+      const str = principal1.toString();
+      expect(str).to.be.an('string');
+    });
+  });
+  it('can persist an identity in indexeddb', () => {
+    cy.visit('http://localhost:1234');
+    cy.window().then(async window => {
+      const { principal1, identity1 } = await setup();
+      const str = principal1.toString();
+      expect(str).to.be.an('string');
+
+      await set('keyPair', identity1.getKeyPair());
+      const storedKeyPair = await get('keyPair');
+
+      const identity2 = await ECDSAKeyIdentity.fromKeyPair(storedKeyPair);
+
+      const whoami2 = createActor(canisterId, { agentOptions: { identity: identity2 } });
+
+      const principal2 = await whoami2.whoami();
+
+      expect(principal2.toString()).to.equal(str);
+    });
+  });
+});

e2e/browser/cypress/fixtures/example.json

@@ -0,0 +1,5 @@
+{
+  "name": "Using fixtures to represent data",
+  "email": "hello@cypress.io",
+  "body": "Fixtures are a great way to mock data for responses to routes"
+}

e2e/browser/cypress/support/commands.js

@@ -0,0 +1,25 @@
+// ***********************************************
+// This example commands.js shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+//
+//
+// -- This is a parent command --
+// Cypress.Commands.add('login', (email, password) => { ... })
+//
+//
+// -- This is a child command --
+// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This will overwrite an existing command --
+// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })

e2e/browser/cypress/support/e2e.js

@@ -0,0 +1,20 @@
+// ***********************************************************
+// This example support/e2e.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.js using ES2015 syntax:
+import './commands';
+
+// Alternatively you can use CommonJS syntax:
+// require('./commands')

e2e/browser/cypress/utils/actor.js

@@ -0,0 +1,25 @@
+import { Actor, HttpAgent } from '@dfinity/agent';
+
+// Imports and re-exports candid interface
+import { idlFactory } from '../../src/declarations/whoami/whoami.did.js';
+export { idlFactory } from '../../src/declarations/whoami/whoami.did.js';
+// CANISTER_ID is replaced by webpack based on node environment
+
+/**
+ *
+ * @param {string | import("@dfinity/principal").Principal} canisterId Canister ID of Agent
+ * @param {{agentOptions?: import("@dfinity/agent").HttpAgentOptions; actorOptions?: import("@dfinity/agent").ActorConfig}} [options]
+ * @return {import("@dfinity/agent").ActorSubclass<import("./whoami.did.js")._SERVICE>}
+ */
+export const createActor = (canisterId, options) => {
+  const agent = new HttpAgent({ ...options?.agentOptions });
+
+  agent.fetchRootKey();
+
+  // Creates an actor with using the candid interface and the HttpAgent
+  return Actor.createActor(idlFactory, {
+    agent,
+    canisterId,
+    ...options?.actorOptions,
+  });
+};

e2e/browser/dfx.json

@@ -0,0 +1,8 @@
+{
+  "canisters": {
+    "whoami": {
+      "type": "motoko",
+      "main": "src/whoami/main.mo"
+    }
+  }
+}