Skip to content

Commit

Permalink
Merge pull request #132 from enkryptcom/develop
Browse files Browse the repository at this point in the history
🍞 Release 1.0.3
  • Loading branch information
brettkolodny authored Aug 19, 2022
2 parents e3f183d + 51623a9 commit 22153ed
Show file tree
Hide file tree
Showing 218 changed files with 6,563 additions and 4,751 deletions.
541 changes: 541 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Large diffs are not rendered by default.

783 changes: 783 additions & 0 deletions .yarn/releases/yarn-3.2.2.cjs

Large diffs are not rendered by default.

785 changes: 0 additions & 785 deletions .yarn/releases/yarn-sources.cjs

This file was deleted.

4 changes: 3 additions & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@ nodeLinker: node-modules
plugins:
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: "@yarnpkg/plugin-workspace-tools"
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"

yarnPath: .yarn/releases/yarn-sources.cjs
yarnPath: .yarn/releases/yarn-3.2.2.cjs
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "enkrypt",
"packageManager": "[email protected].0",
"packageManager": "[email protected].2",
"private": true,
"workspaces": [
"packages/signers/*",
Expand All @@ -22,13 +22,13 @@
"watch-ts": "nodemon --exec 'yarn run build:all && node scripts/compile-done.js'"
},
"devDependencies": {
"@commitlint/cli": "^16.1.0",
"@commitlint/config-conventional": "^16.0.0",
"concurrently": "^7.0.0",
"@commitlint/cli": "^17.0.3",
"@commitlint/config-conventional": "^17.0.3",
"concurrently": "^7.3.0",
"devmoji": "^2.3.0",
"husky": "^7.0.4",
"husky": "^8.0.1",
"node-notifier": "^10.0.1",
"nodemon": "^2.0.15",
"nodemon": "^2.0.19",
"ultra-runner": "^3.10.5"
}
}
40 changes: 20 additions & 20 deletions packages/extension-bridge/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,32 +33,32 @@
"dist"
],
"dependencies": {
"nanoevents": "^6.0.2",
"serialize-error": "9.1.0",
"tiny-uid": "^1.1.1",
"nanoevents": "^7.0.1",
"serialize-error": "11.0.0",
"tiny-uid": "^1.1.2",
"webextension-polyfill": "^0.9.0"
},
"devDependencies": {
"@antfu/eslint-config": "^0.16.1",
"@types/chai": "^4.3.0",
"@types/mocha": "^9.1.0",
"@types/node": "^17.0.17",
"@types/webextension-polyfill": "^0.8.3",
"@typescript-eslint/eslint-plugin": "^5.11.0",
"@typescript-eslint/parser": "^5.11.0",
"bumpp": "^7.1.1",
"eslint": "^8.9.0",
"@antfu/eslint-config": "^0.26.0",
"@types/chai": "^4.3.3",
"@types/mocha": "^9.1.1",
"@types/node": "^18.6.5",
"@types/webextension-polyfill": "^0.9.0",
"@typescript-eslint/eslint-plugin": "^5.33.0",
"@typescript-eslint/parser": "^5.33.0",
"bumpp": "^8.2.1",
"eslint": "^8.21.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-prettier": "^8.3.0",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-alias": "^1.1.2",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-module-resolver": "^1.4.0",
"prettier": "^2.5.1",
"ts-node": "^10.5.0",
"tsconfig-paths": "^3.12.0",
"tsup": "^5.11.13",
"type-fest": "^2.11.2",
"typescript": "^4.5.5",
"prettier": "^2.7.1",
"ts-node": "^10.9.1",
"tsconfig-paths": "^4.1.0",
"tsup": "^6.2.1",
"type-fest": "^2.18.0",
"typescript": "^4.7.4",
"typescript-eslint": "0.0.1-alpha.0"
}
}
3 changes: 1 addition & 2 deletions packages/extension/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@
"vue/setup-compiler-macros": true
},
"extends": [
"@vue/prettier/@typescript-eslint",
"plugin:vue/vue3-recommended",
"eslint:recommended",
"@vue/typescript/recommended",
"@vue/prettier"
"plugin:prettier/recommended"
],
"parserOptions": {
"ecmaVersion": 2020,
Expand Down
6 changes: 4 additions & 2 deletions packages/extension/configs/base-build.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
const path = require("path");

const IS_DEV = process.env.NODE_ENV === "development";
const setConfig = (config) => {
config.devtool("source-map");
if (IS_DEV) config.devtool("source-map");
else config.devtool(false);

config.resolve.symlinks(false);
config.resolve.set("fallback", {
Buffer: require.resolve("buffer"),
Expand Down
3 changes: 3 additions & 0 deletions packages/extension/configs/browser-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ const setConfig = (config) => {
const omitUserScripts = ({ name }) => {
return userScripts.includes(name) ? false : "initial";
};
if (BROWSER === browserNames.firefox) {
config.optimization.minimize(false);
}
config.optimization.splitChunks({
maxSize: 4194304,
cacheGroups: {
Expand Down
5 changes: 3 additions & 2 deletions packages/extension/configs/rollup.config.base.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ import { uglify } from "rollup-plugin-uglify";
import inject from "@rollup/plugin-inject";
import json from "@rollup/plugin-json";

const enableMinification = process.env.minify === "on";
const enableMinification =
process.env.minify === "on" && process.env.BROWSER !== "firefox";
const base = {
input: [],
output: {
dir: "dist/scripts",
format: "iife",
sourcemap: true,
sourcemap: process.env.minify !== "on",
},
plugins: [
typescript(),
Expand Down
101 changes: 50 additions & 51 deletions packages/extension/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "@enkryptcom/extension",
"version": "1.0.2",
"version": "1.0.3",
"private": true,
"scripts": {
"zip": "cd dist; zip -r release.zip *;",
"build:chrome": "cross-env BROWSER='chrome' vue-cli-service build && yarn build:rollup",
"build:firefox": "cross-env BROWSER='firefox' vue-cli-service build && yarn build:rollup",
"build:firefox": "cross-env BROWSER='firefox' vue-cli-service build && cross-env BROWSER='firefox' yarn build:rollup",
"build:opera": "cross-env BROWSER='opera' vue-cli-service build && yarn build:rollup",
"build": "yarn build:chrome",
"lint": "vue-cli-service lint --fix",
Expand All @@ -20,7 +20,7 @@
"watch-vue-firefox": "cross-env BROWSER='firefox' vue-cli-service build --watch --no-clean"
},
"dependencies": {
"@acala-network/api": "^4.1.1",
"@acala-network/api": "^4.1.5",
"@enkryptcom/extension-bridge": "^0.0.1",
"@enkryptcom/hw-wallets": "^0.0.1",
"@enkryptcom/keyring": "^0.0.1",
Expand All @@ -29,90 +29,89 @@
"@enkryptcom/types": "^0.0.1",
"@enkryptcom/utils": "^0.0.1",
"@ethereumjs/common": "^2.6.4",
"@ethereumjs/tx": "^3.5.1",
"@ledgerhq/hw-transport-webusb": "^6.27.1",
"@ethereumjs/tx": "^3.5.2",
"@ledgerhq/hw-transport-webusb": "^6.27.2",
"@metamask/eth-sig-util": "^4.0.1",
"@types/chrome": "^0.0.180",
"@types/chrome": "^0.0.193",
"@types/events": "^3.0.0",
"@types/less": "^3.0.3",
"@types/lodash": "^4.14.182",
"@types/utf-8-validate": "^5.0.0",
"@vueuse/core": "^8.7.5",
"@vueuse/core": "^9.1.0",
"add": "^2.0.6",
"bignumber.js": "^9.0.2",
"bignumber.js": "^9.1.0",
"bip39": "^3.0.4",
"chai": "^4.3.6",
"concurrently": "^7.0.0",
"core-js": "^3.21.0",
"concurrently": "^7.3.0",
"core-js": "^3.24.1",
"ethereumjs-abi": "^0.6.8",
"ethereumjs-util": "^7.1.4",
"ethereumjs-util": "^7.1.5",
"ethereumjs-wallet": "^1.0.2",
"eventemitter3": "^4.0.7",
"lodash": "^4.17.21",
"memoize-one": "^6.0.0",
"moment": "^2.29.1",
"nanoevents": "^6.0.2",
"moment": "^2.29.4",
"nanoevents": "^7.0.1",
"qrcode.vue": "^3.3.3",
"trezor-connect": "^8.2.8",
"trezor-connect": "^8.2.10",
"url-parse": "^1.5.10",
"uuid": "^8.3.2",
"vue": "^3.2.31",
"vue-router": "4",
"vue3-lottie": "^2.1.0",
"vue": "^3.2.37",
"vue-router": "4.1.3",
"vue3-lottie": "^2.2.5",
"vuedraggable": "next",
"web3": "^1.7.3",
"web3-utils": "^1.7.3",
"web3": "^1.7.5",
"web3-utils": "^1.7.5",
"zxcvbn": "^4.4.2"
},
"devDependencies": {
"@polkadot/api": "^8.14.1",
"@polkadot/extension-inject": "^0.44.1",
"@polkadot/keyring": "^10.1.2",
"@polkadot/rpc-provider": "^8.14.1",
"@polkadot/types": "^8.14.1",
"@polkadot/types-known": "^8.14.1",
"@polkadot/ui-shared": "^2.9.1",
"@polkadot/util": "^10.1.1",
"@polkadot/api": "^9.1.1",
"@polkadot/extension-inject": "^0.44.4",
"@polkadot/keyring": "^10.1.3",
"@polkadot/rpc-provider": "^9.1.1",
"@polkadot/types": "^9.1.1",
"@polkadot/types-known": "^9.1.1",
"@polkadot/ui-shared": "^2.9.4",
"@polkadot/util": "^10.1.3",
"@polkadot/wasm-crypto": "^6.3.1",
"@rollup/plugin-commonjs": "^21.0.2",
"@rollup/plugin-commonjs": "^22.0.2",
"@rollup/plugin-inject": "^4.0.4",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^13.1.3",
"@rollup/plugin-typescript": "^8.3.1",
"@rollup/plugin-node-resolve": "^13.3.0",
"@rollup/plugin-typescript": "^8.3.4",
"@types/ethereumjs-abi": "^0.6.3",
"@types/mocha": "^9.1.0",
"@types/mocha": "^9.1.1",
"@types/url-parse": "^1.4.8",
"@types/uuid": "^8.3.4",
"@types/zxcvbn": "^4.4.1",
"@typescript-eslint/eslint-plugin": "^5.4.0",
"@typescript-eslint/parser": "^5.4.0",
"@vue/cli-plugin-babel": "~5.0.4",
"@vue/cli-plugin-eslint": "~5.0.4",
"@vue/cli-plugin-typescript": "~5.0.4",
"@vue/cli-service": "~5.0.4",
"@vue/eslint-config-prettier": "^6.0.0",
"@vue/eslint-config-typescript": "^9.1.0",
"@typescript-eslint/eslint-plugin": "^5.33.0",
"@typescript-eslint/parser": "^5.33.0",
"@vue/cli-plugin-babel": "~5.0.8",
"@vue/cli-plugin-eslint": "~5.0.8",
"@vue/cli-plugin-typescript": "~5.0.8",
"@vue/cli-service": "~5.0.8",
"@vue/eslint-config-typescript": "^11.0.0",
"buffer": "^6.0.3",
"cross-env": "^7.0.3",
"crypto-browserify": "^3.12.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-vue": "^8.0.3",
"eslint": "^8.21.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-vue": "^8.7.1",
"https-browserify": "^1.0.0",
"less": "^4.1.2",
"less-loader": "^5.0.0",
"mocha": "^9.2.0",
"less": "^4.1.3",
"less-loader": "^11.0.0",
"mocha": "^10.0.0",
"path-browserify": "^1.0.1",
"prettier": "^2.4.1",
"prettier": "^2.7.1",
"rimraf": "^3.0.2",
"rollup": "^2.68.0",
"rollup": "^2.77.2",
"rollup-plugin-uglify": "^6.0.4",
"stream-browserify": "^3.0.0",
"stream-http": "^3.2.0",
"ts-mocha": "^9.0.2",
"tsconfig-paths": "^3.12.0",
"typescript": "^4.5.5",
"ts-mocha": "^10.0.0",
"tsconfig-paths": "^4.1.0",
"typescript": "^4.7.4",
"url": "^0.11.0",
"webextension-polyfill": "^0.9.0"
},
Expand Down
4 changes: 4 additions & 0 deletions packages/extension/src/libs/dapp-list/assets/mew.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions packages/extension/src/libs/dapp-list/bsc.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
import { DAppsItem } from "@/types/ui";

const dappList: DAppsItem[] = [
{
title: "MEW",
link: "https://www.myetherwallet.com/",
description: "The original interface for all crypto has to offer.",
isFavorites: false,
image: require("./assets/mew.svg"),
},
{
title: "PancakeSwap",
link: "https://pancakeswap.finance/",
Expand Down Expand Up @@ -42,5 +49,14 @@ const dappList: DAppsItem[] = [
image:
"https://dashboard-assets.dappradar.com/document/6249/momonftfarmer-dapp-games-bsc-logo-166x166_a5766503c5711a16ec0f2d5b34d05a70.png",
},
{
title: "Leonicorn Swap",
link: "https://dex.leonicornswap.com/home",
description:
"Leonicorn Swap is an advanced AMM with features Like NFT Marketplace, Lottery, IDO and many other advanced features.",
isFavorites: false,
image:
"https://dashboard-assets.dappradar.com/document/8905/leonicornswap-dapp-defi-bsc-logo-166x166_ccdf493ffb41233d85061fcc21dcae23.png",
},
];
export default dappList;
27 changes: 26 additions & 1 deletion packages/extension/src/libs/dapp-list/eth.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
import { DAppsItem } from "@/types/ui";

const dappList: DAppsItem[] = [
{
title: "MEW",
link: "https://www.myetherwallet.com/",
description: "The original interface for all crypto has to offer.",
isFavorites: false,
image: require("./assets/mew.svg"),
},
{
title: "Unstoppable Domains",
link: "https://unstoppabledomains.com/?ref=daf66e72f515449",
description:
"Simplifying crypto payments and making web3 easy with NFT domains.",
isFavorites: false,
image:
"https://dashboard-assets.dappradar.com/document/11097/unstoppabledomains-dapp-collectibles-ethereum-logo-166x166_013c8d4a01678362ad762e64b107f1f7.png",
},
{
title: "Rarible",
link: "https://www.rarible.com",
Expand All @@ -12,7 +28,7 @@ const dappList: DAppsItem[] = [
{
title: "OpenSea",
link: "https://opensea.io/",
description: "Discover, collect, and sell extraordinary NFTs",
description: "Discover, collect, and sell extraordinary NFTs.",
isFavorites: false,
image:
"https://dashboard-assets.dappradar.com/document/13/opensea-dapp-marketplaces-ethereum-logo-166x166_f8aad6af2930b1edbeaee6457a505d1b.png",
Expand Down Expand Up @@ -44,5 +60,14 @@ const dappList: DAppsItem[] = [
image:
"https://dashboard-assets.dappradar.com/document/962/compound-defi-eth-logo-166x166_fb07f5c16b0a4a53ae787e5555eca168.png",
},
{
title: "Leonicorn Swap",
link: "https://dex.leonicornswap.com/home",
description:
"Leonicorn Swap is an advanced AMM with features Like NFT Marketplace, Lottery, IDO and many other advanced features.",
isFavorites: false,
image:
"https://dashboard-assets.dappradar.com/document/8905/leonicornswap-dapp-defi-bsc-logo-166x166_ccdf493ffb41233d85061fcc21dcae23.png",
},
];
export default dappList;
7 changes: 7 additions & 0 deletions packages/extension/src/libs/dapp-list/glmr.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
import { DAppsItem } from "@/types/ui";

const dappList: DAppsItem[] = [
{
title: "MEW",
link: "https://www.myetherwallet.com/",
description: "The original interface for all crypto has to offer.",
isFavorites: false,
image: require("./assets/mew.svg"),
},
{
title: "StellaSwap",
link: "https://app.stellaswap.com/exchange/swap",
Expand Down
Loading

2 comments on commit 22153ed

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.