diff --git a/README.md b/README.md index 2ad751e84..50126b1b2 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,9 @@ npm run test:unit ``` ### Run your E2E tests + Start local application first before running the e2e test + ```sh npm run serve npm run test:e2e @@ -56,6 +58,7 @@ npm run lint See [Configuration Reference](https://cli.vuejs.org/config/). ### Current Issues + To get rid of the websocket error, use the following command in the project root (where package.json lives) @@ -64,13 +67,23 @@ find ./node_modules -name ".git" -type d -exec rm -rf {} + ``` ### Release notes -Checklist: -Website: *.tor.us - -| Test/Browser | Chrome | Safari | Brave | Firefox | Edge | iOS Safari | iOS Chrome | Android Chrome | -| ----------------------------------------- | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ----------------- | -| Test login on google/discord oauths | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:| -| Skale Network Change | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:| -| Import Account | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:| -| Test wallet transfer | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:| -| Test on torus-embed vue-app all buttons | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:| \ No newline at end of file + +Checklist: +Website: \*.tor.us + +| Test/Browser | Chrome | Safari | Brave | Firefox | Edge | iOS Safari | iOS Chrome | Android Chrome | +| --------------------------------------- | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | +| Test login on google/discord oauths | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | +| Skale Network Change | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | +| Import Account | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | +| Test wallet transfer | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | +| Test on torus-embed vue-app all buttons | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | + +Notes: + +- When you update @metamask/contract-metadata, run the following command to sync images to s3 + +```sh +cd node_modules/@metamask/contract-metadata +aws s3 cp images s3://images.toruswallet.io/ --cache-control "public, max-age=604800, immutable" --metadata-directive REPLACE --recursive +``` diff --git a/package-lock.json b/package-lock.json index e9fa7519a..c299528e0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1964,9 +1964,9 @@ "dev": true }, "@metamask/contract-metadata": { - "version": "1.28.0", - "resolved": "https://registry.npmjs.org/@metamask/contract-metadata/-/contract-metadata-1.28.0.tgz", - "integrity": "sha512-QZj6Y1nmSs9BHufBS1GSuPX5TVFa5gbtMhEo/KRuSdKyY43OdlbBKuyT36/l5p30krlzfMX8bN0MAWqw3g0Bog==" + "version": "1.29.0", + "resolved": "https://registry.npmjs.org/@metamask/contract-metadata/-/contract-metadata-1.29.0.tgz", + "integrity": "sha512-wxsC0ZCyhPKqThvmsL8+2zVWGWPqofSo8HNtOuOnQM9oGbXX9294imJ3T+A/Lov8fkX4jAWZOeNV0uR80zkNtA==" }, "@metamask/object-multiplex": { "version": "1.2.0", @@ -2459,52 +2459,30 @@ } }, "@toruslabs/openlogin": { - "version": "0.9.5", - "resolved": "https://registry.npmjs.org/@toruslabs/openlogin/-/openlogin-0.9.5.tgz", - "integrity": "sha512-wtYPpWQs+8BluA8NBowYzZ9COR1hi53W1QT43SDvlGy6JkMidyISK/waLpA5l2hTDGd2OFbcHaGVi41p9co6IQ==", + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/@toruslabs/openlogin/-/openlogin-0.10.0.tgz", + "integrity": "sha512-kpE16348mif8G5bfZKlOc5MGxylzoTRLhtaVaygUNvEs8nZxTnz91tkRo/p6bkFzo6DywHOw+wGc6WlW4MuDoQ==", "requires": { "@toruslabs/eccrypto": "^1.1.7", "@toruslabs/http-helpers": "^1.4.0", - "@toruslabs/openlogin-jrpc": "^0.9.5", - "@toruslabs/openlogin-utils": "^0.9.5", + "@toruslabs/openlogin-jrpc": "^0.10.0", + "@toruslabs/openlogin-utils": "^0.10.0", "lodash.merge": "^4.6.2", "pump": "^3.0.0" - }, - "dependencies": { - "@toruslabs/openlogin-utils": { - "version": "0.9.5", - "resolved": "https://registry.npmjs.org/@toruslabs/openlogin-utils/-/openlogin-utils-0.9.5.tgz", - "integrity": "sha512-1SvgRvxW+PARIppW/w9UxXgMtMTvnDucWznDhzJC8JlvdIObJBcmFkzL1gh2nctXEwJJeUIusXz/v6EsDCVkNA==", - "requires": { - "base64url": "^3.0.1", - "keccak": "^3.0.1", - "randombytes": "^2.1.0" - } - } } }, "@toruslabs/openlogin-jrpc": { - "version": "0.9.5", - "resolved": "https://registry.npmjs.org/@toruslabs/openlogin-jrpc/-/openlogin-jrpc-0.9.5.tgz", - "integrity": "sha512-jLvOMhsCZlpFT3lA2PZzaUlXbtwYEXRIUDWVXIWWquuRI5zgH9Pg19HtQ2+i46ikEDl+KAiEoGKo5QuuY6iDXA==", + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/@toruslabs/openlogin-jrpc/-/openlogin-jrpc-0.10.0.tgz", + "integrity": "sha512-0QxXEpdSaMuPtgzMqWona89HSuOlnwazeI2FJ6TnYsSNS9yVV7HukRbBkk1SNqi816O7FKF5vRGnx6btWATGxg==", "requires": { - "@toruslabs/openlogin-utils": "^0.9.5", + "@toruslabs/openlogin-utils": "^0.10.0", "end-of-stream": "^1.4.4", "fast-safe-stringify": "^2.0.8", "once": "^1.4.0", "pump": "^3.0.0" }, "dependencies": { - "@toruslabs/openlogin-utils": { - "version": "0.9.5", - "resolved": "https://registry.npmjs.org/@toruslabs/openlogin-utils/-/openlogin-utils-0.9.5.tgz", - "integrity": "sha512-1SvgRvxW+PARIppW/w9UxXgMtMTvnDucWznDhzJC8JlvdIObJBcmFkzL1gh2nctXEwJJeUIusXz/v6EsDCVkNA==", - "requires": { - "base64url": "^3.0.1", - "keccak": "^3.0.1", - "randombytes": "^2.1.0" - } - }, "fast-safe-stringify": { "version": "2.0.8", "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.8.tgz", @@ -3839,6 +3817,44 @@ "webpack-merge": "^4.2.2" }, "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, "debug": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", @@ -3865,6 +3881,25 @@ "universalify": "^0.1.0" } }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -3897,6 +3932,16 @@ "minipass": "^3.1.1" } }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + }, "terser-webpack-plugin": { "version": "1.4.5", "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz", @@ -3913,6 +3958,18 @@ "webpack-sources": "^1.4.0", "worker-farm": "^1.7.0" } + }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.5.0", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz", + "integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + } } } }, @@ -9252,9 +9309,9 @@ } }, "eslint-plugin-vue-scoped-css": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue-scoped-css/-/eslint-plugin-vue-scoped-css-1.2.2.tgz", - "integrity": "sha512-oQEJAi7oIkbDnjB4fLJ6BBSvqKn3n+IpZcTLgZQG5ddYN6KIQ0hw5EM/DCa3f3KGPRDmhORRStHeyyPHdSdzKw==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue-scoped-css/-/eslint-plugin-vue-scoped-css-1.3.0.tgz", + "integrity": "sha512-jVFnjV7yZvPZeNVyqkSTM8OF0fV21gYdejK9+DigoxxdSSh48HjLsELdLnMvvr637wxovpeGrZely5hek57GMw==", "dev": true, "requires": { "eslint-utils": "^3.0.0", @@ -29851,79 +29908,6 @@ } } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.5.0", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz", - "integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==", - "dev": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-qr": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/vue-qr/-/vue-qr-2.3.1.tgz", diff --git a/package.json b/package.json index 4c3bfade6..30de83b82 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "@ethereumjs/common": "^2.4.0", "@ethereumjs/tx": "^3.3.0", "@gtm-support/vue2-gtm": "^1.1.0", - "@metamask/contract-metadata": "^1.28.0", + "@metamask/contract-metadata": "^1.29.0", "@metamask/object-multiplex": "^1.2.0", "@metamask/obs-store": "^7.0.0", "@metamask/safe-event-emitter": "^2.0.0", @@ -41,7 +41,7 @@ "@toruslabs/fetch-node-details": "^2.7.1", "@toruslabs/http-helpers": "^1.4.0", "@toruslabs/loglevel-sentry": "^2.7.1", - "@toruslabs/openlogin": "^0.9.5", + "@toruslabs/openlogin": "^0.10.0", "@toruslabs/openlogin-utils": "^0.10.0", "@toruslabs/torus.js": "^2.4.4", "@unstoppabledomains/resolution": "^5.0.1", @@ -131,7 +131,7 @@ "eslint-plugin-switch-case": "^1.1.2", "eslint-plugin-unicorn": "^35.0.0", "eslint-plugin-vue": "^7.16.0", - "eslint-plugin-vue-scoped-css": "^1.2.2", + "eslint-plugin-vue-scoped-css": "^1.3.0", "express": "^4.17.1", "fibers": "^5.0.0", "ganache-core": "^2.13.2",