Merge pull request #220 from Synthetixio/dev

promote dev to master
Synthetixio · Sep 19, 2021 · 992edd4 · 992edd4
2 parents 1125bf8 + e4d7d76
commit 992edd4
Show file tree

Hide file tree

Showing 9 changed files with 96 additions and 55 deletions.
diff --git a/.github/workflows/audit_and_lint.yml b/.github/workflows/audit_and_lint.yml
@@ -68,7 +68,7 @@ jobs:
       - name: Upload lint results
         # run if lint failed and only on master/dev branch and pull requests
         if: always() && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.event_name == 'pull_request')
-        uses: github/codeql-action/upload-sarif@89d78ba4572c7854683ec144d212bf0b52cd2a2a # pin@codeql-bundle-20210517
+        uses: github/codeql-action/upload-sarif@4854dd23d5f2aada3f026670784d5109e7702ea9 # pin@codeql-bundle-20210517
         with:
           sarif_file: lint-results.sarif
         continue-on-error: true
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -17,10 +17,10 @@ jobs:
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # pin@v2
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@89d78ba4572c7854683ec144d212bf0b52cd2a2a
+        uses: github/codeql-action/init@4854dd23d5f2aada3f026670784d5109e7702ea9
         with:
           queries: security-and-quality
           languages: javascript
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@89d78ba4572c7854683ec144d212bf0b52cd2a2a
+        uses: github/codeql-action/analyze@4854dd23d5f2aada3f026670784d5109e7702ea9
diff --git a/commands/metamask.js b/commands/metamask.js
@@ -16,6 +16,7 @@ const {
   notificationPageElements,
   permissionsPageElements,
   confirmPageElements,
+  signaturePageElements,
 } = require('../pages/metamask/notification-page');
 const {
   settingsPageElements,
@@ -290,6 +291,24 @@ module.exports = {
     await puppeteer.waitFor(mainPageElements.walletOverview);
     return true;
   },
+  confirmSignatureRequest: async () => {
+    const notificationPage = await puppeteer.switchToMetamaskNotification();
+    await puppeteer.waitAndClick(
+      signaturePageElements.confirmSignatureRequestButton,
+      notificationPage,
+    );
+    await puppeteer.metamaskWindow().waitForTimeout(3000);
+    return true;
+  },
+  rejectSignatureRequest: async () => {
+    const notificationPage = await puppeteer.switchToMetamaskNotification();
+    await puppeteer.waitAndClick(
+      signaturePageElements.rejectSignatureRequestButton,
+      notificationPage,
+    );
+    await puppeteer.metamaskWindow().waitForTimeout(3000);
+    return true;
+  },
   confirmPermissionToSpend: async () => {
     const notificationPage = await puppeteer.switchToMetamaskNotification();
     await puppeteer.waitAndClick(

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -58,7 +58,7 @@
         "bytes32": "0.0.3",
         "commander": "8.1.0",
         "cross-zip": "4.0.0",
-        "cypress": "8.3.1",
+        "cypress": "8.4.0",
         "cypress-wait-until": "1.7.1",
         "eslint": "7.32.0",
         "eslint-config-prettier": "8.3.0",
@@ -79,7 +79,7 @@
         "puppeteer-core": "10.2.0",
         "serve": "12.0.0",
         "start-server-and-test": "1.13.1",
-        "synthetix-js": "2.46.0"
+        "synthetix-js": "2.48.0"
     },
     "devDependencies": {
         "@microsoft/eslint-formatter-sarif": "2.1.5",

diff --git a/pages/metamask/notification-page.js b/pages/metamask/notification-page.js
@@ -9,6 +9,13 @@ module.exports.notificationPageElements = {
   rejectToSpendButton,
 };
 
+const confirmSignatureRequestButton = `${notificationPage} .request-signature__footer__sign-button`;
+const rejectSignatureRequestButton = `${notificationPage} .request-signature__footer__cancel-button`;
+module.exports.signaturePageElements = {
+  confirmSignatureRequestButton,
+  rejectSignatureRequestButton,
+};
+
 const permissionsPage = '.permissions-connect';
 const connectButton = `${permissionsPage} .permission-approval-container__footers button:nth-child(2)`;
 module.exports.permissionsPageElements = {

diff --git a/plugins/index.js b/plugins/index.js
@@ -123,6 +123,14 @@ module.exports = (on, config) => {
       const disconnected = await metamask.disconnectWalletFromAllDapps();
       return disconnected;
     },
+    confirmMetamaskSignatureRequest: async () => {
+      const confirmed = await metamask.confirmSignatureRequest();
+      return confirmed;
+    },
+    rejectMetamaskSignatureRequest: async () => {
+      const rejected = await metamask.rejectSignatureRequest();
+      return rejected;
+    },
     confirmMetamaskPermissionToSpend: async () => {
       const confirmed = await metamask.confirmPermissionToSpend();
       return confirmed;

diff --git a/support/commands.js b/support/commands.js
@@ -62,6 +62,14 @@ Cypress.Commands.add('disconnectMetamaskWalletFromAllDapps', () => {
   return cy.task('disconnectMetamaskWalletFromAllDapps');
 });
 
+Cypress.Commands.add('confirmMetamaskSignatureRequest', () => {
+  return cy.task('confirmMetamaskSignatureRequest');
+});
+
+Cypress.Commands.add('rejectMetamaskSignatureRequest', () => {
+  return cy.task('rejectMetamaskSignatureRequest');
+});
+
 Cypress.Commands.add('confirmMetamaskPermissionToSpend', () => {
   return cy.task('confirmMetamaskPermissionToSpend');
 });

diff --git a/support/index.d.ts b/support/index.d.ts
@@ -106,6 +106,18 @@ declare namespace Cypress {
      * cy.disconnectMetamaskWalletFromAllDapps()
      */
     disconnectMetamaskWalletFromAllDapps(): Chainable<Subject>;
+    /**
+     * Confirm metamask permission to sign message
+     * @example
+     * cy.confirmMetamaskSignatureRequest()
+     */
+    confirmMetamaskSignatureRequest(): Chainable<Subject>;
+    /**
+     * Reject metamask permission to sign message
+     * @example
+     * cy.rejectMetamaskSignatureRequest()
+     */
+    rejectMetamaskSignatureRequest(): Chainable<Subject>;
     /**
      * Confirm metamask permission to spend asset
      * @example