Skip to content

Commit 664c55d

Browse files
committed
devop: merge main
2 parents 17772c9 + c11549f commit 664c55d

424 files changed

Lines changed: 5683 additions & 4825 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.

.github/workflows/test-swap.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Test all swap providers
2+
3+
on: [push]
4+
5+
jobs:
6+
test:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v4
10+
- uses: actions/setup-node@v4
11+
with:
12+
node-version: "22.10.0"
13+
cache: "yarn"
14+
- run: yarn install
15+
- run: yarn build:all
16+
- run: cd packages/swap && yarn test

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ Enkrypt is a web3 wallet built from the ground up to support the multi-chain fut
100100
- Shiden EVM
101101
- Sepolia
102102
- Syscoin NEVM
103+
- Taraxa
103104
- Telos EVM
104105
- Unique
105106
- Vara Network
@@ -109,6 +110,12 @@ Enkrypt is a web3 wallet built from the ground up to support the multi-chain fut
109110
- zkSync
110111
- zkSync Goerli
111112
- 5ireChain
113+
- Story
114+
- Abstract
115+
- Berachain
116+
- Ink Onchain
117+
- Unichain
118+
- Gravity
112119
- More coming soon!
113120

114121
Looking to add your project? [Contact us!](https://mewwallet.typeform.com/enkrypt-inquiry?typeform-source=www.enkrypt.com)

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
]
2020
},
2121
"scripts": {
22-
"test": "yarn workspaces foreach --worktree -v run test",
22+
"test": "yarn workspaces foreach --worktree -v --exclude packages/swap run test",
2323
"lint": "yarn workspaces foreach --worktree run lint",
2424
"build:all": "ultra -r build",
2525
"watch": "concurrently 'npm:watch-*'",
@@ -32,9 +32,9 @@
3232
"prepare": "husky"
3333
},
3434
"devDependencies": {
35-
"@commitlint/cli": "^19.7.1",
36-
"@commitlint/config-conventional": "^19.7.1",
37-
"@swc/core": "^1.10.14",
35+
"@commitlint/cli": "^19.8.0",
36+
"@commitlint/config-conventional": "^19.8.0",
37+
"@swc/core": "^1.11.9",
3838
"concurrently": "^9.1.2",
3939
"husky": "^9.1.7",
4040
"node-notifier": "^10.0.1",

packages/extension-bridge/package.json

Lines changed: 9 additions & 9 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.13.1",
48-
"@types/webextension-polyfill": "^0.12.1",
47+
"@types/node": "^22.13.10",
48+
"@types/webextension-polyfill": "^0.12.3",
4949
"@typescript-eslint/eslint-plugin": "^5.62.0",
5050
"@typescript-eslint/parser": "^5.62.0",
51-
"bumpp": "^10.0.2",
52-
"eslint": "^9.20.0",
51+
"bumpp": "^10.1.0",
52+
"eslint": "^9.22.0",
5353
"eslint-config-airbnb-base": "^15.0.0",
5454
"eslint-config-prettier": "^9.1.0",
5555
"eslint-import-resolver-alias": "^1.1.2",
5656
"eslint-plugin-import": "^2.31.0",
5757
"eslint-plugin-module-resolver": "^1.5.0",
58-
"prettier": "^3.4.2",
58+
"prettier": "^3.5.3",
5959
"ts-node": "^10.9.2",
6060
"tsconfig-paths": "^4.2.0",
61-
"tsup": "^8.3.6",
62-
"type-fest": "^4.33.0",
63-
"typescript": "^5.7.3",
64-
"typescript-eslint": "8.23.0"
61+
"tsup": "^8.4.0",
62+
"type-fest": "^4.37.0",
63+
"typescript": "^5.8.2",
64+
"typescript-eslint": "8.26.1"
6565
}
6666
}

packages/extension/package.json

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@enkryptcom/extension",
3-
"version": "2.4.5",
3+
"version": "2.5.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.11.11",
27+
"@amplitude/analytics-browser": "^2.11.13",
2828
"@enkryptcom/extension-bridge": "workspace:^",
2929
"@enkryptcom/hw-wallets": "workspace:^",
3030
"@enkryptcom/keyring": "workspace:^",
@@ -37,24 +37,24 @@
3737
"@ethereumjs/tx": "^5.4.0",
3838
"@ethereumjs/util": "^9.1.0",
3939
"@ethereumjs/wallet": "^2.0.4",
40-
"@kadena/client": "^1.16.0",
41-
"@kadena/pactjs-cli": "^1.16.0",
40+
"@kadena/client": "^1.17.1",
41+
"@kadena/pactjs-cli": "^1.17.1",
4242
"@ledgerhq/hw-transport-webusb": "^6.29.4",
4343
"@metamask/eth-sig-util": "^8.2.0",
4444
"@metaplex-foundation/mpl-bubblegum": "^4.3.1",
45-
"@metaplex-foundation/umi": "^1.0.0",
46-
"@metaplex-foundation/umi-bundle-defaults": "^1.0.0",
47-
"@polkadot/api": "^15.5.2",
48-
"@polkadot/extension-inject": "^0.58.3",
49-
"@polkadot/keyring": "^13.3.1",
50-
"@polkadot/rpc-provider": "^15.5.2",
51-
"@polkadot/types": "^15.5.2",
52-
"@polkadot/types-known": "^15.5.2",
53-
"@polkadot/ui-shared": "^3.12.1",
54-
"@polkadot/util": "^13.3.1",
45+
"@metaplex-foundation/umi": "^1.1.1",
46+
"@metaplex-foundation/umi-bundle-defaults": "^1.1.1",
47+
"@polkadot/api": "^15.8.1",
48+
"@polkadot/extension-inject": "^0.58.5",
49+
"@polkadot/keyring": "^13.4.3",
50+
"@polkadot/rpc-provider": "^15.8.1",
51+
"@polkadot/types": "^15.8.1",
52+
"@polkadot/types-known": "^15.8.1",
53+
"@polkadot/ui-shared": "^3.12.2",
54+
"@polkadot/util": "^13.4.3",
5555
"@polkadot/wasm-crypto": "^7.4.1",
56-
"@solana-developers/helpers": "^2.7.0",
57-
"@solana/spl-token": "^0.4.12",
56+
"@solana-developers/helpers": "^2.8.0",
57+
"@solana/spl-token": "^0.4.13",
5858
"@solana/wallet-standard-features": "^1.3.0",
5959
"@solana/web3.js": "^1.98.0",
6060
"@wallet-standard/base": "^1.1.0",
@@ -78,7 +78,7 @@
7878
"qrcode.vue": "^3.6.0",
7979
"switch-ts": "^1.1.1",
8080
"url-parse": "^1.5.10",
81-
"uuid": "^11.0.5",
81+
"uuid": "^11.1.0",
8282
"vue": "^3.5.13",
8383
"vue-echarts": "7.0.3",
8484
"vue-router": "^4.5.0",
@@ -90,55 +90,55 @@
9090
"zxcvbn": "^4.4.2"
9191
},
9292
"devDependencies": {
93-
"@crxjs/vite-plugin": "^2.0.0-beta.31",
94-
"@rollup/plugin-commonjs": "^28.0.2",
93+
"@crxjs/vite-plugin": "^2.0.0-beta.32",
94+
"@rollup/plugin-commonjs": "^28.0.3",
9595
"@rollup/plugin-inject": "^5.0.5",
9696
"@rollup/plugin-json": "^6.1.0",
97-
"@rollup/plugin-node-resolve": "^16.0.0",
97+
"@rollup/plugin-node-resolve": "^16.0.1",
9898
"@rollup/plugin-replace": "^6.0.2",
9999
"@rollup/plugin-terser": "^0.4.4",
100100
"@rollup/plugin-typescript": "^12.1.2",
101101
"@tsconfig/node20": "^20.1.4",
102102
"@types/bs58": "^4.0.4",
103-
"@types/chrome": "^0.0.302",
103+
"@types/chrome": "^0.0.309",
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.15",
109-
"@types/node": "^22.13.1",
108+
"@types/lodash": "^4.17.16",
109+
"@types/node": "^22.13.10",
110110
"@types/url-parse": "^1.4.11",
111111
"@types/utf-8-validate": "^5.0.2",
112112
"@types/uuid": "^10.0.0",
113113
"@types/wif": "^2.0.5",
114114
"@types/zxcvbn": "^4.4.5",
115115
"@vitejs/plugin-vue": "^5.2.1",
116116
"@vue/eslint-config-prettier": "^10.2.0",
117-
"@vue/eslint-config-typescript": "^14.3.0",
117+
"@vue/eslint-config-typescript": "^14.5.0",
118118
"@vue/tsconfig": "^0.7.0",
119-
"@vueuse/core": "^12.5.0",
119+
"@vueuse/core": "^12.8.2",
120120
"cross-env": "^7.0.3",
121-
"eslint": "^9.20.0",
122-
"eslint-plugin-vue": "^9.32.0",
121+
"eslint": "^9.22.0",
122+
"eslint-plugin-vue": "^9.33.0",
123123
"fs-extra": "^11.3.0",
124124
"jsdom": "^26.0.0",
125125
"less": "^4.2.2",
126126
"less-loader": "^12.2.0",
127127
"npm-run-all2": "^7.0.2",
128-
"prettier": "^3.4.2",
128+
"prettier": "^3.5.3",
129129
"rimraf": "^6.0.1",
130-
"rollup": "^4.34.6",
130+
"rollup": "^4.35.0",
131131
"rollup-plugin-visualizer": "^5.14.0",
132132
"semver": "^7.7.1",
133133
"systeminformation": "^5.25.11",
134-
"tsup": "^8.3.6",
135-
"typescript": "~5.7.3",
134+
"tsup": "^8.4.0",
135+
"typescript": "~5.8.2",
136136
"url": "^0.11.4",
137-
"vite": "^6.1.0",
137+
"vite": "^6.2.1",
138138
"vite-plugin-node-polyfills": "0.23.0",
139139
"vite-tsconfig-paths": "^5.1.4",
140-
"vitest": "^3.0.5",
141-
"vue-tsc": "^2.2.0",
140+
"vitest": "^3.0.8",
141+
"vue-tsc": "^2.2.8",
142142
"webextension-polyfill": "^0.12.0"
143143
},
144144
"installConfig": {
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
import BrowserStorage from '../common/browser-storage';
2+
import { InternalStorageNamespace } from '@/types/provider';
3+
import { IState, StorageKeys } from './types';
4+
5+
class MenuState {
6+
private storage: BrowserStorage;
7+
8+
constructor() {
9+
this.storage = new BrowserStorage(InternalStorageNamespace.menuState);
10+
}
11+
12+
async setState(state: IState): Promise<void> {
13+
return this.storage.set(StorageKeys.menuState, state);
14+
}
15+
16+
async getState(): Promise<IState> {
17+
const state = await this.storage.get(StorageKeys.menuState);
18+
if (!state) {
19+
const newState: IState = {
20+
isExpanded: true,
21+
};
22+
return newState;
23+
}
24+
return state;
25+
}
26+
27+
async getIsExpanded(): Promise<IState['isExpanded']> {
28+
const state: IState = await this.getState();
29+
return state?.isExpanded ?? true;
30+
}
31+
async setIsExpanded(isExpanded: boolean): Promise<void> {
32+
const state: IState = await this.getState();
33+
const newState: IState = { ...state, isExpanded };
34+
await this.setState(newState);
35+
}
36+
}
37+
38+
export default MenuState;
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
export enum StorageKeys {
2+
menuState = 'menu-state-info',
3+
}
4+
5+
export interface IState {
6+
isExpanded: boolean;
7+
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,17 @@ export default async (
3939
[NetworkNames.Palm]: 'palm',
4040
[NetworkNames.ProofOfPlayApex]: 'proof-of-play',
4141
[NetworkNames.Scroll]: 'scroll',
42+
[NetworkNames.Unichain]: 'unichain',
43+
[NetworkNames.Bera]: 'berachain'
4244
};
4345
if (!Object.keys(supportedNetworks).includes(network.name))
4446
throw new Error('Simplehash: network not supported');
4547
let allItems: SHNFTType[] = [];
4648
const fetchAll = (continuation?: string): Promise<void> => {
4749
const query = continuation
4850
? continuation
49-
: `${SH_ENDPOINT}owners_v2?chains=${
50-
supportedNetworks[network.name as keyof typeof supportedNetworks]
51-
}&wallet_addresses=${address}&filters=spam_score__lte=75`;
51+
: `${SH_ENDPOINT}owners_v2?chains=${supportedNetworks[network.name as keyof typeof supportedNetworks]
52+
}&wallet_addresses=${address}&filters=spam_score__lte=75`;
5253
return cacheFetch(
5354
{
5455
url: query,

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
SettingsType,
99
BtcSettingsType,
1010
EnkryptSettingsType,
11+
CurrencySettingsType,
1112
} from './types';
1213
import { merge } from 'lodash';
1314

@@ -71,16 +72,31 @@ class SettingsState {
7172
async setBtcSettings(state: BtcSettingsType): Promise<void> {
7273
await this.#storage.set(StorageKeys.btcState, state);
7374
}
75+
76+
async setCurrencySettings(state: CurrencySettingsType): Promise<void> {
77+
await this.#storage.set(StorageKeys.currencyState, state);
78+
}
79+
80+
async getCurrencySettings(): Promise<CurrencySettingsType> {
81+
const state = await this.getStateByKey(StorageKeys.currencyState);
82+
const settings: CurrencySettingsType = {
83+
value: 'USD',
84+
};
85+
return merge(settings, state);
86+
}
87+
7488
async getAllSettings(): Promise<SettingsType> {
7589
const evmstate = await this.getEVMSettings();
7690
const substratestate = await this.getSubstrateSettings();
7791
const btcstate = await this.getBtcSettings();
7892
const enkryptState = await this.getEnkryptSettings();
93+
const currencySettingsState = await this.getCurrencySettings();
7994
return {
8095
evm: evmstate,
8196
substrate: substratestate,
8297
btc: btcstate,
8398
enkrypt: enkryptState,
99+
currencySettingsState: currencySettingsState,
84100
manifestVersion: Browser.runtime.getManifest().manifest_version,
85101
};
86102
}

packages/extension/src/libs/settings-state/types.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ export enum StorageKeys {
33
substrateState = 'substrate-settings-state',
44
btcState = 'btc-settings-state',
55
enkryptState = 'enkrypt-settings-state',
6+
currencyState = 'currency-settings-state',
67
}
78
export interface EVMInjectSettings {
89
disabled: boolean;
@@ -22,10 +23,15 @@ export interface EnkryptSettingsType {
2223
randomUserID: string;
2324
isMetricsEnabled: boolean;
2425
}
26+
27+
export interface CurrencySettingsType {
28+
value: string;
29+
}
2530
export interface SettingsType {
2631
evm: EVMSettingsType;
2732
substrate: SubstrateSettingsType;
2833
btc: BtcSettingsType;
2934
enkrypt: EnkryptSettingsType;
35+
currencySettingsState: CurrencySettingsType;
3036
manifestVersion: number;
3137
}

0 commit comments

Comments
 (0)