Skip to content

Commit a894d4e

Browse files
committed
Merge branch 'main' into feat/safari-support
2 parents 430ea23 + 1b2c545 commit a894d4e

127 files changed

Lines changed: 5593 additions & 2305 deletions

File tree

Some content is hidden

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

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
"devDependencies": {
3535
"@commitlint/cli": "^19.8.1",
3636
"@commitlint/config-conventional": "^19.8.1",
37-
"@swc/core": "^1.12.1",
38-
"concurrently": "^9.1.2",
37+
"@swc/core": "^1.13.2",
38+
"concurrently": "^9.2.0",
3939
"husky": "^9.1.7",
4040
"node-notifier": "^10.0.1",
4141
"nodemon": "^3.1.10",

packages/extension-bridge/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,23 @@
4444
"webextension-polyfill": "^0.12.0"
4545
},
4646
"devDependencies": {
47-
"@types/node": "^22.15.24",
47+
"@types/node": "^22.16.5",
4848
"@types/webextension-polyfill": "^0.12.3",
49-
"@typescript-eslint/eslint-plugin": "^8.34.1",
50-
"@typescript-eslint/parser": "^8.34.1",
49+
"@typescript-eslint/eslint-plugin": "^8.38.0",
50+
"@typescript-eslint/parser": "^8.38.0",
5151
"bumpp": "^10.2.0",
52-
"eslint": "^9.29.0",
52+
"eslint": "^9.32.0",
5353
"eslint-config-airbnb-base": "^15.0.0",
54-
"eslint-config-prettier": "^10.1.5",
54+
"eslint-config-prettier": "^10.1.8",
5555
"eslint-import-resolver-alias": "^1.1.2",
56-
"eslint-plugin-import": "^2.31.0",
56+
"eslint-plugin-import": "^2.32.0",
5757
"eslint-plugin-module-resolver": "^1.5.0",
58-
"prettier": "^3.5.3",
58+
"prettier": "^3.6.2",
5959
"ts-node": "^10.9.2",
6060
"tsconfig-paths": "^4.2.0",
6161
"tsup": "^8.5.0",
6262
"type-fest": "^4.41.0",
6363
"typescript": "^5.8.3",
64-
"typescript-eslint": "8.34.1"
64+
"typescript-eslint": "8.38.0"
6565
}
6666
}

packages/extension/eslint.config.mjs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import pluginVue from 'eslint-plugin-vue'
2-
import vueTsEslintConfig from '@vue/eslint-config-typescript'
3-
import skipFormatting from '@vue/eslint-config-prettier/skip-formatting'
1+
import pluginVue from 'eslint-plugin-vue';
2+
import vueTsEslintConfig from '@vue/eslint-config-typescript';
3+
import skipFormatting from '@vue/eslint-config-prettier/skip-formatting';
44

55
export default [
66
{
@@ -10,7 +10,7 @@ export default [
1010

1111
{
1212
name: 'app/files-to-ignore',
13-
ignores: ['**/dist/**', '**/dist-ssr/**', '**/coverage/**'],
13+
ignores: ['**/dist/**', '**/dist-ssr/**', '**/coverage/**', 'public/**/*'],
1414
},
1515

1616
...pluginVue.configs['flat/essential'],
@@ -31,4 +31,4 @@ export default [
3131
},
3232
ignores: ['./public/vendor', './dist'],
3333
},
34-
]
34+
];

packages/extension/package.json

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@enkryptcom/extension",
3-
"version": "2.9.0",
3+
"version": "2.10.0",
44
"private": true,
55
"type": "module",
66
"scripts": {
@@ -24,7 +24,7 @@
2424
"watch:firefox": "yarn prebuild && cross-env BROWSER='firefox' vite"
2525
},
2626
"dependencies": {
27-
"@amplitude/analytics-browser": "^2.17.10",
27+
"@amplitude/analytics-browser": "^2.20.1",
2828
"@enkryptcom/extension-bridge": "workspace:^",
2929
"@enkryptcom/hw-wallets": "workspace:^",
3030
"@enkryptcom/keyring": "workspace:^",
@@ -37,33 +37,33 @@
3737
"@ethereumjs/tx": "^5.4.0",
3838
"@ethereumjs/util": "^9.1.0",
3939
"@ethereumjs/wallet": "^2.0.4",
40-
"@kadena/client": "^1.17.1",
41-
"@kadena/pactjs-cli": "^1.17.1",
42-
"@ledgerhq/hw-transport-webusb": "^6.29.6",
40+
"@kadena/client": "^1.18.0",
41+
"@kadena/pactjs-cli": "^1.18.0",
42+
"@ledgerhq/hw-transport-webusb": "^6.29.8",
4343
"@metamask/eth-sig-util": "^8.2.0",
44-
"@metaplex-foundation/mpl-bubblegum": "^5.0.1",
44+
"@metaplex-foundation/mpl-bubblegum": "^5.0.2",
4545
"@metaplex-foundation/umi": "^1.2.0",
4646
"@metaplex-foundation/umi-bundle-defaults": "^1.2.0",
47-
"@polkadot/api": "^16.2.2",
48-
"@polkadot/extension-inject": "^0.59.2",
49-
"@polkadot/keyring": "^13.5.2",
50-
"@polkadot/rpc-provider": "^16.2.2",
51-
"@polkadot/types": "^16.2.2",
52-
"@polkadot/types-known": "^16.2.2",
53-
"@polkadot/ui-shared": "^3.14.1",
54-
"@polkadot/util": "^13.5.2",
47+
"@polkadot/api": "^16.4.2",
48+
"@polkadot/extension-inject": "^0.61.4",
49+
"@polkadot/keyring": "^13.5.3",
50+
"@polkadot/rpc-provider": "^16.4.2",
51+
"@polkadot/types": "^16.4.2",
52+
"@polkadot/types-known": "^16.4.2",
53+
"@polkadot/ui-shared": "^3.15.2",
54+
"@polkadot/util": "^13.5.3",
5555
"@polkadot/wasm-crypto": "^7.4.1",
5656
"@solana-developers/helpers": "2.8.0",
5757
"@solana/spl-token": "^0.4.13",
5858
"@solana/wallet-standard-features": "^1.3.0",
5959
"@solana/web3.js": "^1.98.2",
6060
"@wallet-standard/base": "^1.1.0",
6161
"add": "^2.0.6",
62-
"bignumber.js": "^9.3.0",
62+
"bignumber.js": "^9.3.1",
6363
"bip39": "^3.1.0",
6464
"bitcoinjs-lib": "^6.1.7",
6565
"bs58": "^6.0.0",
66-
"concurrently": "^9.1.2",
66+
"concurrently": "^9.2.0",
6767
"echarts": "^5.6.0",
6868
"ethereum-cryptography": "^2.2.1",
6969
"ethereumjs-abi": "^0.6.8",
@@ -79,7 +79,7 @@
7979
"switch-ts": "^1.1.1",
8080
"url-parse": "^1.5.10",
8181
"uuid": "^11.1.0",
82-
"vue": "^3.5.16",
82+
"vue": "^3.5.18",
8383
"vue-echarts": "7.0.3",
8484
"vue-router": "^4.5.1",
8585
"vue3-lottie": "^3.3.1",
@@ -97,16 +97,16 @@
9797
"@rollup/plugin-node-resolve": "^16.0.1",
9898
"@rollup/plugin-replace": "^6.0.2",
9999
"@rollup/plugin-terser": "^0.4.4",
100-
"@rollup/plugin-typescript": "^12.1.3",
100+
"@rollup/plugin-typescript": "^12.1.4",
101101
"@tsconfig/node20": "^20.1.6",
102102
"@types/bs58": "^5.0.0",
103-
"@types/chrome": "^0.0.326",
103+
"@types/chrome": "^0.1.1",
104104
"@types/ethereumjs-abi": "^0.6.5",
105105
"@types/events": "^3.0.3",
106106
"@types/fs-extra": "^11.0.4",
107107
"@types/less": "^3.0.8",
108-
"@types/lodash": "^4.17.17",
109-
"@types/node": "^22.15.24",
108+
"@types/lodash": "^4.17.20",
109+
"@types/node": "^22.16.5",
110110
"@types/semver": "^7.7.0",
111111
"@types/url-parse": "^1.4.11",
112112
"@types/utf-8-validate": "^5.0.2",
@@ -115,31 +115,31 @@
115115
"@types/zxcvbn": "^4.4.5",
116116
"@vitejs/plugin-vue": "^5.2.4",
117117
"@vue/eslint-config-prettier": "^10.2.0",
118-
"@vue/eslint-config-typescript": "^14.5.1",
118+
"@vue/eslint-config-typescript": "^14.6.0",
119119
"@vue/tsconfig": "^0.7.0",
120-
"@vueuse/core": "^13.3.0",
120+
"@vueuse/core": "^13.5.0",
121121
"cross-env": "^7.0.3",
122-
"eslint": "^9.29.0",
123-
"eslint-plugin-vue": "^10.2.0",
122+
"eslint": "^9.32.0",
123+
"eslint-plugin-vue": "^10.3.0",
124124
"fs-extra": "^11.3.0",
125125
"jsdom": "^26.1.0",
126-
"less": "^4.3.0",
126+
"less": "^4.4.0",
127127
"less-loader": "^12.3.0",
128128
"npm-run-all2": "^8.0.4",
129-
"prettier": "^3.5.3",
129+
"prettier": "^3.6.2",
130130
"rimraf": "^6.0.1",
131-
"rollup": "^4.43.0",
131+
"rollup": "^4.45.1",
132132
"rollup-plugin-visualizer": "^6.0.3",
133133
"semver": "^7.7.2",
134-
"systeminformation": "^5.27.3",
134+
"systeminformation": "^5.27.7",
135135
"tsup": "^8.5.0",
136136
"typescript": "~5.8.3",
137137
"url": "^0.11.4",
138138
"vite": "^6.3.5",
139-
"vite-plugin-node-polyfills": "0.23.0",
139+
"vite-plugin-node-polyfills": "0.24.0",
140140
"vite-tsconfig-paths": "^5.1.4",
141141
"vitest": "^3.2.4",
142-
"vue-tsc": "^2.2.10",
142+
"vue-tsc": "^2.2.12",
143143
"webextension-polyfill": "^0.12.0"
144144
},
145145
"installConfig": {

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ const lists: Partial<Record<NetworkNames, string>> = {
5555
'https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/avax.json',
5656
[NetworkNames.Fantom]:
5757
'https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/ftm.json',
58-
[NetworkNames.Klaytn]:
59-
'https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/klay.json',
6058
[NetworkNames.Aurora]:
6159
'https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/aurora.json',
6260
[NetworkNames.Base]:
@@ -67,8 +65,6 @@ const lists: Partial<Record<NetworkNames, string>> = {
6765
'https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/matic-zkevm.json',
6866
[NetworkNames.Bitcoin]:
6967
'https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/btc.json',
70-
[NetworkNames.Arthera]:
71-
'https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/arthera.json',
7268
[NetworkNames.Blast]:
7369
'https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/blast.json',
7470
[NetworkNames.ArbitrumNova]:

packages/extension/src/libs/name-resolver/index.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ class GenericNameResolver {
1414
});
1515
}
1616

17-
async resolveName(name: string, coins: CoinType[], providerChain?: string): Promise<string | null> {
17+
async resolveName(
18+
name: string,
19+
coins: CoinType[],
20+
providerChain?: string,
21+
): Promise<string | null> {
1822
let response: string | null = null;
1923
for (const coin of coins) {
2024
response = await this.nameResolver

packages/extension/src/libs/nft-handlers/conflux.ts

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import { NFTCollection, NFTType, NFTItem } from '@/types/nft';
1+
import { NFTCollection, NFTType } from '@/types/nft';
22
import { NodeType } from '@/types/provider';
33
import cacheFetch from '../cache-fetch';
44
import { NetworkNames } from '@enkryptcom/types';
55
import {
66
ConfluxResponse,
77
ConfluxNFTItem,
88
NFTBalanceItem,
9-
ListResponse,
109
NFTItemWithDesc,
1110
} from './types/conflux';
1211

@@ -21,9 +20,9 @@ export default async (
2120
): Promise<NFTCollection[]> => {
2221
if (network.name !== NetworkNames.Conflux)
2322
throw new Error('Conflux: network not supported');
24-
let allItems: NFTCollection[] = [];
23+
const allItems: NFTCollection[] = [];
2524

26-
let nftBalances: ConfluxResponse = await cacheFetch(
25+
const nftBalances: ConfluxResponse = await cacheFetch(
2726
{
2827
url: `${CONFLUX_ENDPOINT}/nft/balances?owner=${address}&skip=0&limit=100`,
2928
},
@@ -33,16 +32,16 @@ export default async (
3332
return [];
3433
}
3534

36-
for (let collection of nftBalances.result
35+
for (const collection of nftBalances.result
3736
.list as unknown as NFTBalanceItem[]) {
38-
let contract = collection.contract;
37+
const contract = collection.contract;
3938

40-
let items = await getCollectionItems(contract, address);
39+
const items = await getCollectionItems(contract, address);
4140
if (!items.length) {
4241
continue;
4342
}
4443

45-
let nftCollection: NFTCollection = {
44+
const nftCollection: NFTCollection = {
4645
name: collection.name,
4746
image: collection.iconUrl || '',
4847
description: items[0].description,
@@ -59,7 +58,7 @@ async function getCollectionItems(
5958
contract: string,
6059
address: string,
6160
): Promise<NFTItemWithDesc[]> {
62-
let itemResponse: ConfluxResponse = await cacheFetch(
61+
const itemResponse: ConfluxResponse = await cacheFetch(
6362
{
6463
url: `${CONFLUX_ENDPOINT}/nft/tokens?contract=${contract}&owner=${address}&skip=0&limit=100&withBrief=${true}&withMetadata=${true}&suppressMetadataError=${true}`,
6564
},
@@ -69,7 +68,7 @@ async function getCollectionItems(
6968
if (itemResponse.status !== '1') {
7069
return [];
7170
}
72-
let items: ConfluxNFTItem[] = itemResponse.result
71+
const items: ConfluxNFTItem[] = itemResponse.result
7372
.list as unknown as ConfluxNFTItem[];
7473

7574
return items.map(item => ({

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ export default class RateState {
1212
}
1313

1414
/**
15-
*
16-
* @param immediate
15+
*
16+
* @param immediate
1717
* @returns boolean
18-
*
18+
*
1919
* allow popup to show immediately
20-
*
20+
*
2121
*/
2222
async showPopup(immediate: boolean = false): Promise<boolean> {
2323
const state: IState | undefined = await this.storage.get(
@@ -49,8 +49,7 @@ export default class RateState {
4949

5050
await this.storage.set(StorageKeys.rateInfo, state);
5151
return true;
52-
}
53-
else if (!state.alreadyRated) {
52+
} else if (!state.alreadyRated) {
5453
if (state.popupTime < now) {
5554
state.popupTime = popupTime;
5655

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { InternalStorageNamespace } from "@/types/provider";
2-
import BrowserStorage from "../common/browser-storage";
3-
import { IState, } from "./types";
4-
import { NetworkNames } from "@enkryptcom/types";
5-
import { BaseNetwork } from "@/types/base-network";
1+
import { InternalStorageNamespace } from '@/types/provider';
2+
import BrowserStorage from '../common/browser-storage';
3+
import { IState } from './types';
4+
import { NetworkNames } from '@enkryptcom/types';
5+
import { BaseNetwork } from '@/types/base-network';
66

77
class RecentlySentAddressesState {
8-
#storage: BrowserStorage
8+
#storage: BrowserStorage;
99

1010
constructor() {
1111
this.#storage = new BrowserStorage(
@@ -17,25 +17,23 @@ class RecentlySentAddressesState {
1717
network: Pick<BaseNetwork, 'name' | 'displayAddress'>,
1818
address: string,
1919
): Promise<void> {
20-
const key = network.name
21-
const state: IState | undefined = await this.#storage.get(key)
20+
const key = network.name;
21+
const state: IState | undefined = await this.#storage.get(key);
2222
const newState: IState = {
2323
...state,
24-
addresses: Array.from(new Set([
25-
network.displayAddress(address),
26-
...(state?.addresses ?? []),
27-
])).slice(0, 5),
28-
}
29-
await this.#storage.set(key, newState)
24+
addresses: Array.from(
25+
new Set([network.displayAddress(address), ...(state?.addresses ?? [])]),
26+
).slice(0, 5),
27+
};
28+
await this.#storage.set(key, newState);
3029
}
3130

3231
async getRecentlySentAddresses(networkName: NetworkNames): Promise<string[]> {
33-
const key = networkName
34-
const out: IState | undefined = await this.#storage.get(key)
35-
if (!out) return []
36-
return out.addresses
32+
const key = networkName;
33+
const out: IState | undefined = await this.#storage.get(key);
34+
if (!out) return [];
35+
return out.addresses;
3736
}
3837
}
3938

40-
export default RecentlySentAddressesState
41-
39+
export default RecentlySentAddressesState;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
export type IState = {
2-
addresses: string[]
3-
}
2+
addresses: string[];
3+
};

0 commit comments

Comments
 (0)