Skip to content

Commit d2f8958

Browse files
committed
Merge branch 'feat/provider-names' into feat/restricted-popup
2 parents 475bb3e + 305d41f commit d2f8958

File tree

70 files changed

+2796
-1831
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+2796
-1831
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ Enkrypt is a web3 wallet built from the ground up to support the multi-chain fut
119119
- Gravity
120120
- Unit Zero
121121
- Unit Zero Testnet
122+
- Nibiru
123+
- Nibiru Testnet
122124
- More coming soon!
123125

124126
Looking to add your project? [Contact us!](https://mewwallet.typeform.com/enkrypt-inquiry?typeform-source=www.enkrypt.com)
@@ -226,4 +228,4 @@ Email - info@enkrypt.com
226228

227229
Homepage - [https://www.enkrypt.com/](https://www.enkrypt.com/)
228230

229-
<p align="right">(<a href="#top">back to top</a>)</p>
231+
<p align="right">(<a href="#top">back to top</a>)</p>

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
"prepare": "husky"
3333
},
3434
"devDependencies": {
35-
"@commitlint/cli": "^20.0.0",
35+
"@commitlint/cli": "^20.1.0",
3636
"@commitlint/config-conventional": "^20.0.0",
37-
"@swc/core": "^1.13.19",
37+
"@swc/core": "^1.15.2",
3838
"concurrently": "^9.2.1",
3939
"husky": "^9.1.7",
4040
"node-notifier": "^10.0.1",
41-
"nodemon": "^3.1.10",
41+
"nodemon": "^3.1.11",
4242
"ultra-runner": "^3.10.5",
4343
"vite-plugin-node-polyfills": "0.24.0"
4444
},

packages/extension-bridge/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@
4444
"webextension-polyfill": "^0.12.0"
4545
},
4646
"devDependencies": {
47-
"@types/node": "^22.18.6",
48-
"@types/webextension-polyfill": "^0.12.3",
49-
"@typescript-eslint/eslint-plugin": "^8.44.1",
50-
"@typescript-eslint/parser": "^8.44.1",
51-
"bumpp": "^10.2.3",
52-
"eslint": "^9.36.0",
47+
"@types/node": "^22.19.1",
48+
"@types/webextension-polyfill": "^0.12.4",
49+
"@typescript-eslint/eslint-plugin": "^8.47.0",
50+
"@typescript-eslint/parser": "^8.47.0",
51+
"bumpp": "^10.3.1",
52+
"eslint": "^9.39.1",
5353
"eslint-config-airbnb-base": "^15.0.0",
5454
"eslint-config-prettier": "^10.1.8",
5555
"eslint-import-resolver-alias": "^1.1.2",
@@ -58,9 +58,9 @@
5858
"prettier": "^3.6.2",
5959
"ts-node": "^10.9.2",
6060
"tsconfig-paths": "^4.2.0",
61-
"tsup": "^8.5.0",
62-
"type-fest": "^5.0.1",
63-
"typescript": "^5.9.2",
64-
"typescript-eslint": "8.44.1"
61+
"tsup": "^8.5.1",
62+
"type-fest": "^5.2.0",
63+
"typescript": "^5.9.3",
64+
"typescript-eslint": "8.47.0"
6565
}
6666
}

packages/extension/package.json

Lines changed: 49 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
11
{
22
"name": "@enkryptcom/extension",
3-
"version": "2.13.1",
3+
"version": "2.14.0",
44
"private": true,
55
"type": "module",
66
"scripts": {
7-
"dev": "cross-env BROWSER='chrome' vite",
7+
"dev": "yarn prebuild && cross-env BROWSER='chrome' vite",
88
"build2": "run-p type-check \"build-only {@}\" --",
99
"preview": "vite preview",
1010
"build-only": "vite build",
1111
"type-check": "vue-tsc --build --force",
1212
"lint": "eslint . --fix && yarn format",
1313
"format": "prettier --write src/",
1414
"zip": "cd dist; zip -r release.zip *;",
15-
"build:chrome": "cross-env BROWSER='chrome' MINIFY='true' vite build",
16-
"build:firefox": "cross-env BROWSER='firefox' MINIFY='true' vite build && node configs/get-system-info.js",
17-
"build:opera": "cross-env BROWSER='opera' MINIFY='true' vite build",
15+
"prebuild": "yarn kadena:prebuild",
16+
"build:chrome": "yarn prebuild && cross-env BROWSER='chrome' MINIFY='true' vite build",
17+
"build:firefox": "yarn prebuild && cross-env BROWSER='firefox' MINIFY='true' vite build && node configs/get-system-info.js",
18+
"build:opera": "yarn prebuild && cross-env BROWSER='opera' MINIFY='true' vite build",
19+
"kadena:prebuild": "pactjs contract-generate --contract=coin --api https://api.chainweb-community.org/chainweb/0.0/mainnet01/chain/1/pact",
1820
"test": "vitest run -c ./configs/vitest.config.mts",
1921
"watch": "yarn dev",
2022
"watch:chrome": "yarn dev",
21-
"watch:firefox": "cross-env BROWSER='firefox' vite"
23+
"watch:firefox": "yarn prebuild && cross-env BROWSER='firefox' vite"
2224
},
2325
"dependencies": {
24-
"@amplitude/analytics-browser": "^2.25.0",
26+
"@amplitude/analytics-browser": "^2.31.1",
2527
"@enkryptcom/extension-bridge": "workspace:^",
2628
"@enkryptcom/hw-wallets": "workspace:^",
2729
"@enkryptcom/keyring": "workspace:^",
@@ -34,23 +36,23 @@
3436
"@ethereumjs/tx": "^5.4.0",
3537
"@ethereumjs/util": "^9.1.0",
3638
"@ethereumjs/wallet": "^2.0.4",
37-
"@kadena/client": "^1.18.2",
38-
"@kadena/pactjs-cli": "^1.18.2",
39-
"@ledgerhq/hw-transport-webusb": "^6.29.11",
39+
"@kadena/client": "^1.18.3",
40+
"@kadena/pactjs-cli": "^1.18.3",
41+
"@ledgerhq/hw-transport-webusb": "^6.29.13",
4042
"@massalabs/massa-web3": "^5.3.0",
4143
"@metamask/eth-sig-util": "^8.2.0",
4244
"@metaplex-foundation/mpl-bubblegum": "^5.0.2",
4345
"@metaplex-foundation/umi": "^1.4.1",
4446
"@metaplex-foundation/umi-bundle-defaults": "^1.4.1",
45-
"@polkadot/api": "^16.4.8",
46-
"@polkadot/extension-inject": "^0.62.1",
47-
"@polkadot/keyring": "^13.5.6",
48-
"@polkadot/rpc-provider": "^16.4.8",
49-
"@polkadot/types": "^16.4.8",
50-
"@polkadot/types-known": "^16.4.8",
51-
"@polkadot/ui-shared": "^3.16.1",
52-
"@polkadot/util": "^13.5.6",
53-
"@polkadot/wasm-crypto": "^7.5.1",
47+
"@polkadot/api": "^16.5.2",
48+
"@polkadot/extension-inject": "^0.62.5",
49+
"@polkadot/keyring": "^13.5.8",
50+
"@polkadot/rpc-provider": "^16.5.2",
51+
"@polkadot/types": "^16.5.2",
52+
"@polkadot/types-known": "^16.5.2",
53+
"@polkadot/ui-shared": "^3.16.3",
54+
"@polkadot/util": "^13.5.8",
55+
"@polkadot/wasm-crypto": "^7.5.2",
5456
"@solana-developers/helpers": "2.8.0",
5557
"@solana/spl-token": "^0.4.14",
5658
"@solana/wallet-standard-features": "^1.3.0",
@@ -72,14 +74,14 @@
7274
"moment": "^2.30.1",
7375
"nanoevents": "^9.1.0",
7476
"pact-lang-api": "^4.3.6",
75-
"pinia": "^3.0.3",
77+
"pinia": "^3.0.4",
7678
"qrcode.vue": "^3.6.0",
7779
"switch-ts": "^1.1.1",
7880
"url-parse": "^1.5.10",
7981
"uuid": "^13.0.0",
80-
"vue": "^3.5.22",
81-
"vue-echarts": "7.0.3",
82-
"vue-router": "^4.5.1",
82+
"vue": "^3.5.24",
83+
"vue-echarts": "8.0.1",
84+
"vue-router": "^4.6.3",
8385
"vue3-lottie": "^3.3.1",
8486
"vuedraggable": "^4.1.0",
8587
"web3-eth": "^1.10.4",
@@ -88,56 +90,56 @@
8890
"zxcvbn": "^4.4.2"
8991
},
9092
"devDependencies": {
91-
"@crxjs/vite-plugin": "^2.2.0",
92-
"@rollup/plugin-commonjs": "^28.0.6",
93+
"@crxjs/vite-plugin": "^2.2.1",
94+
"@rollup/plugin-commonjs": "^29.0.0",
9395
"@rollup/plugin-inject": "^5.0.5",
9496
"@rollup/plugin-json": "^6.1.0",
95-
"@rollup/plugin-node-resolve": "^16.0.1",
96-
"@rollup/plugin-replace": "^6.0.2",
97+
"@rollup/plugin-node-resolve": "^16.0.3",
98+
"@rollup/plugin-replace": "^6.0.3",
9799
"@rollup/plugin-terser": "^0.4.4",
98-
"@rollup/plugin-typescript": "^12.1.4",
99-
"@tsconfig/node20": "^20.1.6",
100+
"@rollup/plugin-typescript": "^12.3.0",
101+
"@tsconfig/node20": "^20.1.8",
100102
"@types/bs58": "^5.0.0",
101-
"@types/chrome": "^0.1.12",
103+
"@types/chrome": "^0.1.31",
102104
"@types/ethereumjs-abi": "^0.6.5",
103105
"@types/events": "^3.0.3",
104106
"@types/fs-extra": "^11.0.4",
105107
"@types/less": "^3.0.8",
106108
"@types/lodash": "^4.17.20",
107-
"@types/node": "^22.18.6",
109+
"@types/node": "^22.19.1",
108110
"@types/semver": "^7.7.1",
109111
"@types/url-parse": "^1.4.11",
110112
"@types/utf-8-validate": "^5.0.2",
111113
"@types/uuid": "^11.0.0",
112114
"@types/wif": "^2.0.5",
113115
"@types/zxcvbn": "^4.4.5",
114-
"@vitejs/plugin-vue": "^6.0.1",
116+
"@vitejs/plugin-vue": "^6.0.2",
115117
"@vue/eslint-config-prettier": "^10.2.0",
116118
"@vue/eslint-config-typescript": "^14.6.0",
117119
"@vue/tsconfig": "^0.8.1",
118-
"@vueuse/core": "^13.9.0",
119-
"cross-env": "^10.0.0",
120-
"eslint": "^9.36.0",
121-
"eslint-plugin-vue": "^10.5.0",
120+
"@vueuse/core": "^14.0.0",
121+
"cross-env": "^10.1.0",
122+
"eslint": "^9.39.1",
123+
"eslint-plugin-vue": "^10.5.1",
122124
"fs-extra": "^11.3.2",
123125
"jsdom": "^26.1.0",
124-
"less": "^4.4.1",
126+
"less": "^4.4.2",
125127
"less-loader": "^12.3.0",
126128
"npm-run-all2": "^8.0.4",
127129
"prettier": "^3.6.2",
128-
"rimraf": "^6.0.1",
129-
"rollup": "^4.52.2",
130-
"rollup-plugin-visualizer": "^6.0.3",
131-
"semver": "^7.7.2",
132-
"systeminformation": "^5.27.10",
133-
"tsup": "^8.5.0",
134-
"typescript": "~5.9.2",
130+
"rimraf": "^6.1.2",
131+
"rollup": "^4.53.3",
132+
"rollup-plugin-visualizer": "^6.0.5",
133+
"semver": "^7.7.3",
134+
"systeminformation": "^5.27.11",
135+
"tsup": "^8.5.1",
136+
"typescript": "~5.9.3",
135137
"url": "^0.11.4",
136-
"vite": "^7.1.7",
138+
"vite": "^7.2.2",
137139
"vite-plugin-node-polyfills": "0.24.0",
138140
"vite-tsconfig-paths": "^5.1.4",
139-
"vitest": "^3.2.4",
140-
"vue-tsc": "^3.0.8",
141+
"vitest": "^4.0.10",
142+
"vue-tsc": "^3.1.4",
141143
"webextension-polyfill": "^0.12.0"
142144
},
143145
"installConfig": {

packages/extension/src/libs/backup-state/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ class BackupState {
156156

157157
async restoreBackup(userId: string, keyringPassword: string): Promise<void> {
158158
const mainWallet = await this.getMainWallet();
159+
const exludedSignerTypes: SignerType[] = [];
159160
await sendUsingInternalMessengers({
160161
method: InternalMethods.unlock,
161162
params: [keyringPassword, false],
@@ -207,6 +208,7 @@ class BackupState {
207208

208209
for (const key of Object.keys(highestPathIndex)) {
209210
const [basePath, signerType] = key.split('###');
211+
if (exludedSignerTypes.includes(signerType as SignerType)) continue;
210212
for (let i = 0; i <= highestPathIndex[key]; i++) {
211213
const newAccount = getAccountByIndex(
212214
decryptedBackup.accounts,

packages/extension/src/libs/dapp-list/index.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,12 @@ const lists: Partial<Record<NetworkNames, string>> = {
3333
'https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/okc.json',
3434
[NetworkNames.Optimism]:
3535
'https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/op.json',
36-
[NetworkNames.Canto]:
37-
'https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/canto.json',
3836
[NetworkNames.Bifrost]:
3937
'https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/bifrost.json',
4038
[NetworkNames.BifrostKusama]:
4139
'https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/bifrost.json',
4240
[NetworkNames.Edgeware]:
4341
'https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/edg.json',
44-
[NetworkNames.ZkSyncGoerli]:
45-
'https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/zksyncgoerli.json',
4642
[NetworkNames.ZkSync]:
4743
'https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/zksync.json',
4844
[NetworkNames.Rootstock]:
@@ -75,8 +71,6 @@ const lists: Partial<Record<NetworkNames, string>> = {
7571
'https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/godwoken.json',
7672
[NetworkNames.ImmutableZkevm]:
7773
'https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/imx.json',
78-
[NetworkNames.ZChains]:
79-
'https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/zchains.json',
8074
[NetworkNames.MantaPacific]:
8175
'https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/manta.json',
8276
[NetworkNames.Mode]:
@@ -85,8 +79,6 @@ const lists: Partial<Record<NetworkNames, string>> = {
8579
'https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/opBNB.json',
8680
[NetworkNames.Palm]:
8781
'https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/palm.json',
88-
[NetworkNames.ProofOfPlayApex]:
89-
'https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/popApex.json',
9082
[NetworkNames.Scroll]:
9183
'https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/scroll.json',
9284
[NetworkNames.Rari]:

packages/extension/src/libs/utils/initialize-wallet.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import KeyRing from '@/libs/keyring/keyring';
22
import EthereumNetworks from '@/providers/ethereum/networks';
33
import PolkadotNetworks from '@/providers/polkadot/networks';
44
import BitcoinNetworks from '@/providers/bitcoin/networks';
5-
import KadenaNetworks from '@/providers/kadena/networks';
65
import SolanaNetworks from '@/providers/solana/networks';
6+
import KadenaNetworks from '@/providers/kadena/networks';
77
import MassaNetworks from '@/providers/massa/networks';
88
import { NetworkNames, WalletType } from '@enkryptcom/types';
99
import { getAccountsByNetworkName } from '@/libs/utils/accounts';

packages/extension/src/libs/utils/providersDetails.ts

Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { NetworkNames } from '@enkryptcom/types';
22

3-
const newNetworks: NetworkNames[] = [];
3+
const newNetworks: NetworkNames[] = [NetworkNames.Nibiru];
44
const newSwaps: NetworkNames[] = [];
55

66
export { newNetworks, newSwaps };

packages/extension/src/providers/ethereum/libs/activity-handlers/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import TomoScan from './providers/tomoscan';
55
import OntEVMActivity from './providers/ont-evm';
66
import TelosActivity from './providers/telos';
77
import GodwokenActivity from './providers/godwoken';
8+
import RoutescanActivity from './providers/routescan';
89
export {
910
RivetActivity,
1011
EtherscanActivity,
@@ -13,4 +14,5 @@ export {
1314
TomoScan,
1415
TelosActivity,
1516
GodwokenActivity,
17+
RoutescanActivity,
1618
};

0 commit comments

Comments
 (0)