Skip to content

Commit

Permalink
Merge pull request #317 from enkryptcom/develop
Browse files Browse the repository at this point in the history
Release: v1.22.0
  • Loading branch information
kvhnuke authored Jun 26, 2023
2 parents 6d1a6c8 + 29dcb6b commit 9d09517
Show file tree
Hide file tree
Showing 58 changed files with 1,772 additions and 2,722 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
"version:apply": "yarn version apply --all"
},
"devDependencies": {
"@commitlint/cli": "^17.6.1",
"@commitlint/config-conventional": "^17.6.1",
"@swc/core": "^1.3.53",
"@commitlint/cli": "^17.6.5",
"@commitlint/config-conventional": "^17.6.5",
"@swc/core": "^1.3.66",
"concurrently": "^7.6.0",
"devmoji": "^2.3.0",
"husky": "^8.0.3",
Expand Down
10 changes: 5 additions & 5 deletions packages/extension-bridge/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@
},
"devDependencies": {
"@antfu/eslint-config": "^0.27.0",
"@types/chai": "^4.3.4",
"@types/chai": "^4.3.5",
"@types/mocha": "^9.1.1",
"@types/node": "^18.16.0",
"@types/node": "^18.16.18",
"@types/webextension-polyfill": "^0.10.0",
"@typescript-eslint/eslint-plugin": "^5.59.1",
"@typescript-eslint/parser": "^5.59.1",
"@typescript-eslint/eslint-plugin": "^5.60.0",
"@typescript-eslint/parser": "^5.60.0",
"bumpp": "^8.2.1",
"eslint": "^8.39.0",
"eslint": "^8.43.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-prettier": "^8.8.0",
"eslint-import-resolver-alias": "^1.1.2",
Expand Down
69 changes: 35 additions & 34 deletions packages/extension/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@enkryptcom/extension",
"version": "1.21.0",
"version": "1.22.0",
"private": true,
"scripts": {
"zip": "cd dist; zip -r release.zip *;",
Expand All @@ -18,7 +18,7 @@
"watch-vue-firefox": "cross-env BROWSER='firefox' vue-cli-service build --watch --no-clean"
},
"dependencies": {
"@acala-network/api": "^4.1.8-2.3",
"@babel/runtime": "^7.22.5",
"@enkryptcom/extension-bridge": "workspace:^",
"@enkryptcom/hw-wallets": "workspace:^",
"@enkryptcom/keyring": "workspace:^",
Expand All @@ -27,57 +27,58 @@
"@enkryptcom/swap": "workspace:^",
"@enkryptcom/types": "workspace:^",
"@enkryptcom/utils": "workspace:^",
"@ethereumjs/common": "^3.1.2",
"@ethereumjs/tx": "^4.1.2",
"@ledgerhq/hw-transport-webusb": "^6.27.13",
"@ethereumjs/common": "^3.2.0",
"@ethereumjs/tx": "^4.2.0",
"@ledgerhq/hw-transport-webusb": "^6.27.15",
"@metamask/eth-sig-util": "^5.1.0",
"@types/chrome": "^0.0.233",
"@types/chrome": "^0.0.237",
"@types/events": "^3.0.0",
"@types/less": "^3.0.3",
"@types/lodash": "^4.14.194",
"@types/lodash": "^4.14.195",
"@types/utf-8-validate": "^5.0.0",
"@vueuse/core": "^9.13.0",
"add": "^2.0.6",
"bignumber.js": "^9.1.1",
"bip39": "^3.1.0",
"bitcoinjs-lib": "^6.1.0",
"bitcoinjs-lib": "^6.1.3",
"bitcoinjs-message": "^2.2.0",
"chai": "^4.3.7",
"concurrently": "^7.6.0",
"core-js": "^3.30.1",
"core-js": "^3.31.0",
"echarts": "^5.4.2",
"ethereumjs-abi": "^0.6.8",
"ethereumjs-util": "^7.1.5",
"ethereumjs-wallet": "^1.0.2",
"eventemitter3": "^5.0.0",
"eventemitter3": "^5.0.1",
"lodash": "^4.17.21",
"memoize-one": "^6.0.0",
"moment": "^2.29.4",
"nanoevents": "^7.0.1",
"pinia": "^2.0.35",
"pinia": "^2.1.4",
"qrcode.vue": "^3.4.0",
"switch-ts": "^1.1.1",
"url-parse": "^1.5.10",
"uuid": "^9.0.0",
"vue": "^3.2.47",
"vue-echarts": "^6.5.5",
"vue-router": "4.1.6",
"vue3-lottie": "^2.5.0",
"vue": "^3.3.4",
"vue-echarts": "^6.6.0",
"vue-router": "4.2.2",
"vue3-lottie": "^2.7.3",
"vuedraggable": "^4.1.0",
"web3-eth": "^1.9.0",
"web3-utils": "^1.9.0",
"web3-eth": "^1.10.0",
"web3-utils": "^1.10.0",
"yarn": "^1.22.19",
"zxcvbn": "^4.4.2"
},
"devDependencies": {
"@polkadot/api": "^9.14.2",
"@polkadot/extension-inject": "^0.44.9",
"@polkadot/keyring": "^10.4.2",
"@polkadot/rpc-provider": "^9.14.2",
"@polkadot/types": "^9.14.2",
"@polkadot/types-known": "^9.14.2",
"@polkadot/ui-shared": "^2.12.1",
"@polkadot/util": "^10.4.2",
"@polkadot/wasm-crypto": "^6.4.1",
"@polkadot/api": "^10.9.1",
"@polkadot/extension-inject": "^0.46.5",
"@polkadot/keyring": "^12.3.2",
"@polkadot/rpc-provider": "^10.9.1",
"@polkadot/types": "^10.9.1",
"@polkadot/types-known": "^10.9.1",
"@polkadot/ui-shared": "^3.5.1",
"@polkadot/util": "^12.3.2",
"@polkadot/wasm-crypto": "^7.2.1",
"@rollup/plugin-commonjs": "^22.0.2",
"@rollup/plugin-inject": "^4.0.4",
"@rollup/plugin-json": "^4.1.0",
Expand All @@ -86,26 +87,26 @@
"@types/ethereumjs-abi": "^0.6.3",
"@types/mocha": "^9.1.1",
"@types/url-parse": "^1.4.8",
"@types/uuid": "^9.0.1",
"@types/uuid": "^9.0.2",
"@types/wif": "^2.0.2",
"@types/zxcvbn": "^4.4.1",
"@typescript-eslint/eslint-plugin": "^5.59.1",
"@typescript-eslint/parser": "^5.59.1",
"@typescript-eslint/eslint-plugin": "^5.60.0",
"@typescript-eslint/parser": "^5.60.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.2",
"@vue/eslint-config-typescript": "^11.0.3",
"buffer": "^6.0.3",
"cross-env": "^7.0.3",
"crypto-browserify": "^3.12.0",
"eslint": "^8.39.0",
"eslint": "^8.43.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-vue": "^8.7.1",
"https-browserify": "^1.0.0",
"less": "^4.1.3",
"less-loader": "^11.1.0",
"less-loader": "^11.1.3",
"mocha": "^10.2.0",
"path-browserify": "^1.0.1",
"prettier": "^2.8.8",
Expand All @@ -114,11 +115,11 @@
"rollup-plugin-uglify": "^6.0.4",
"stream-browserify": "^3.0.0",
"stream-http": "^3.2.0",
"systeminformation": "^5.17.12",
"systeminformation": "^5.18.4",
"ts-mocha": "^10.0.0",
"tsconfig-paths": "^4.2.0",
"typescript": "^4.9.5",
"url": "^0.11.0",
"url": "^0.11.1",
"webextension-polyfill": "^0.10.0"
},
"installConfig": {
Expand Down
2 changes: 1 addition & 1 deletion packages/extension/src/manifest/base.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"author": "https://www.enkrypt.com",
"homepage_url": "https://www.enkrypt.com",
"version": "",
"name": "Enkrypt: Ethereum, Polkadot & RSK Wallet",
"name": "Enkrypt: Ethereum, Polkadot & AVAX Wallet",
"short_name": "Enkrypt",
"permissions": [
"storage",
Expand Down
8 changes: 8 additions & 0 deletions packages/extension/src/manifest/tests/manifests.mocha.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import BaseManifest from "../base.json";
import { expect } from "chai";

describe("Various tests related to manifest", () => {
it("should have correct lengths", async () => {
expect(BaseManifest.name.length).to.be.lessThanOrEqual(45);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ class AccountState {
await this.#storage.set(StorageKeys.accountsState, allStates);
}
}
async isConnected(domain: string): Promise<boolean> {
return this.getStateByDomain(domain).then(
(res) => res.approvedAccounts.length > 0
);
}
async deleteAllStates(): Promise<void> {
return await this.#storage.remove(StorageKeys.accountsState);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ class AccountState {
await this.#storage.set(StorageKeys.accountsState, allStates);
}
}
async isConnected(domain: string): Promise<boolean> {
return this.getStateByDomain(domain).then(
(res) => res.approvedAccounts.length > 0
);
}
async deleteAllStates(): Promise<void> {
return await this.#storage.remove(StorageKeys.accountsState);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ class AccountState {
await this.#storage.set(StorageKeys.accountsState, allStates);
}
}
async isConnected(domain: string): Promise<boolean> {
return this.getStateByDomain(domain).then((res) => res.isApproved);
}
async deleteAllStates(): Promise<void> {
return await this.#storage.remove(StorageKeys.accountsState);
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 4 additions & 2 deletions packages/extension/src/providers/polkadot/networks/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import edgNode from "./edgeware";
import opalNode from "./unique/opal";
import quartzNode from "./unique/quartz";
import uniqueNode from "./unique/unique";
// import interlayNode from "./interlay/interlay";
// import kintsugiNode from "./interlay/kintsugi";
import penNode from "./pendulum/pendulum";
import ampeNode from "./pendulum/amplitude";

export default {
acala: acaNode,
Expand All @@ -28,6 +28,8 @@ export default {
opal: opalNode,
quartz: quartzNode,
unique: uniqueNode,
pendulum: penNode,
amplitude: ampeNode,
// interlay: interlayNode,
// kintsugi: kintsugiNode,
};
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

This file was deleted.

Loading

2 comments on commit 9d09517

@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.