Skip to content

Commit 841a41d

Browse files
kvhnukekvhnuke
committed
Merge branch 'develop' into firoorg-feature/add-firo-network
2 parents c043a54 + df1cd61 commit 841a41d

22 files changed

Lines changed: 1188 additions & 1133 deletions

File tree

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232
"prepare": "husky"
3333
},
3434
"devDependencies": {
35-
"@commitlint/cli": "^20.5.0",
36-
"@commitlint/config-conventional": "^20.5.0",
37-
"@swc/core": "^1.15.21",
35+
"@commitlint/cli": "^20.5.3",
36+
"@commitlint/config-conventional": "^20.5.3",
37+
"@swc/core": "^1.15.40",
3838
"concurrently": "^9.2.1",
3939
"husky": "^9.1.7",
4040
"node-notifier": "^10.0.1",
4141
"nodemon": "^3.1.14",
4242
"ultra-runner": "^3.10.5",
43-
"vite-plugin-node-polyfills": "0.26.0"
43+
"vite-plugin-node-polyfills": "0.28.0"
4444
},
4545
"resolutions": {
4646
"@zondax/ledger-cosmos-js/vue": "^3.5.12",

‎packages/extension-bridge/package.json‎

Lines changed: 6 additions & 6 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.19.15",
47+
"@types/node": "^22.19.19",
4848
"@types/webextension-polyfill": "^0.12.5",
49-
"@typescript-eslint/eslint-plugin": "^8.58.0",
50-
"@typescript-eslint/parser": "^8.58.0",
49+
"@typescript-eslint/eslint-plugin": "^8.59.4",
50+
"@typescript-eslint/parser": "^8.59.4",
5151
"bumpp": "^10.4.1",
5252
"eslint": "^9.39.4",
5353
"eslint-config-airbnb-base": "^15.0.0",
5454
"eslint-config-prettier": "^10.1.8",
5555
"eslint-import-resolver-alias": "^1.1.2",
5656
"eslint-plugin-import": "^2.32.0",
5757
"eslint-plugin-module-resolver": "^1.5.0",
58-
"prettier": "^3.8.1",
58+
"prettier": "^3.8.3",
5959
"ts-node": "^10.9.2",
6060
"tsconfig-paths": "^4.2.0",
6161
"tsup": "^8.5.1",
62-
"type-fest": "^5.5.0",
62+
"type-fest": "^5.6.0",
6363
"typescript": "^5.9.3",
64-
"typescript-eslint": "8.58.0"
64+
"typescript-eslint": "8.59.4"
6565
}
6666
}

‎packages/extension/package.json‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@enkryptcom/extension",
3-
"version": "2.17.0",
3+
"version": "2.18.0",
44
"private": true,
55
"type": "module",
66
"scripts": {
@@ -23,7 +23,7 @@
2323
"watch:firefox": "yarn prebuild && cross-env BROWSER='firefox' vite"
2424
},
2525
"dependencies": {
26-
"@amplitude/analytics-browser": "^2.38.1",
26+
"@amplitude/analytics-browser": "^2.42.4",
2727
"@bitcoinerlab/secp256k1": "^1.2.0",
2828
"@enkryptcom/extension-bridge": "workspace:^",
2929
"@enkryptcom/hw-wallets": "workspace:^",
@@ -39,7 +39,7 @@
3939
"@ethereumjs/wallet": "^2.0.4",
4040
"@kadena/client": "^1.18.3",
4141
"@kadena/pactjs-cli": "^1.18.3",
42-
"@ledgerhq/hw-transport-webusb": "^6.33.0",
42+
"@ledgerhq/hw-transport-webusb": "^6.34.2",
4343
"@massalabs/massa-web3": "^5.3.0",
4444
"@metamask/eth-sig-util": "^8.2.0",
4545
"@metaplex-foundation/mpl-bubblegum": "^5.0.2",
@@ -66,24 +66,24 @@
6666
"bitcoinjs-lib-firo": "git+https://github.com/blockstars-tech/bitcoinjs-lib#4b0c4322cb9f308cb84b2f655d16a9e9abc7b4e1",
6767
"bs58": "^6.0.0",
6868
"concurrently": "^9.2.1",
69-
"echarts": "^6.0.0",
69+
"echarts": "^6.1.0",
7070
"ecpair": "^3.0.0",
7171
"electrum-client-browser": "1.2.5",
7272
"ethereum-cryptography": "^2.2.1",
7373
"ethereumjs-abi": "^0.6.8",
7474
"eventemitter3": "^5.0.4",
7575
"jdenticon": "^3.3.0",
76-
"lodash": "^4.18.0",
76+
"lodash": "^4.18.1",
7777
"memoize-one": "^6.0.0",
7878
"moment": "^2.30.1",
7979
"nanoevents": "^9.1.0",
8080
"pact-lang-api": "^4.3.6",
8181
"pinia": "^3.0.4",
82-
"qrcode.vue": "^3.8.0",
82+
"qrcode.vue": "^3.9.1",
8383
"switch-ts": "^2.0.0",
8484
"url-parse": "^1.5.10",
85-
"uuid": "^13.0.0",
86-
"vue": "^3.5.31",
85+
"uuid": "^13.0.2",
86+
"vue": "^3.5.34",
8787
"vue-echarts": "8.0.1",
8888
"vue-router": "^4.6.4",
8989
"vue3-lottie": "^3.3.1",
@@ -104,46 +104,46 @@
104104
"@rollup/plugin-typescript": "^12.3.0",
105105
"@tsconfig/node20": "^20.1.9",
106106
"@types/bs58": "^5.0.0",
107-
"@types/chrome": "^0.1.38",
107+
"@types/chrome": "^0.1.42",
108108
"@types/ethereumjs-abi": "^0.6.5",
109109
"@types/events": "^3.0.3",
110110
"@types/fs-extra": "^11.0.4",
111111
"@types/less": "^3.0.8",
112112
"@types/lodash": "^4.17.24",
113-
"@types/node": "^22.19.15",
113+
"@types/node": "^22.19.19",
114114
"@types/semver": "^7.7.1",
115115
"@types/url-parse": "^1.4.11",
116116
"@types/utf-8-validate": "^5.0.2",
117117
"@types/uuid": "^11.0.0",
118118
"@types/wif": "^2.0.5",
119119
"@types/zxcvbn": "^4.4.5",
120-
"@vitejs/plugin-vue": "^6.0.5",
120+
"@vitejs/plugin-vue": "^6.0.7",
121121
"@vue/eslint-config-prettier": "^10.2.0",
122122
"@vue/eslint-config-typescript": "^14.7.0",
123-
"@vue/tsconfig": "^0.8.1",
124-
"@vueuse/core": "^14.2.1",
123+
"@vue/tsconfig": "^0.9.1",
124+
"@vueuse/core": "^14.3.0",
125125
"cross-env": "^10.1.0",
126126
"eslint": "^9.39.4",
127-
"eslint-plugin-vue": "^10.8.0",
128-
"fs-extra": "^11.3.4",
129-
"jsdom": "^29.0.1",
127+
"eslint-plugin-vue": "^10.9.1",
128+
"fs-extra": "^11.3.5",
129+
"jsdom": "^29.1.1",
130130
"less": "^4.6.4",
131-
"less-loader": "^12.3.2",
131+
"less-loader": "^12.3.3",
132132
"npm-run-all2": "^8.0.4",
133-
"prettier": "^3.8.1",
133+
"prettier": "^3.8.3",
134134
"rimraf": "^6.1.3",
135-
"rollup": "^4.60.1",
135+
"rollup": "^4.60.4",
136136
"rollup-plugin-visualizer": "^6.0.11",
137-
"semver": "^7.7.4",
138-
"systeminformation": "^5.31.5",
137+
"semver": "^7.8.1",
138+
"systeminformation": "^5.31.6",
139139
"tsup": "^8.5.1",
140140
"typescript": "~5.9.3",
141141
"url": "^0.11.4",
142-
"vite": "^7.3.1",
142+
"vite": "^7.3.3",
143143
"vite-plugin-node-polyfills": "0.26.0",
144144
"vite-tsconfig-paths": "^6.1.1",
145-
"vitest": "^4.1.2",
146-
"vue-tsc": "^3.2.6",
145+
"vitest": "^4.1.7",
146+
"vue-tsc": "^3.3.1",
147147
"webextension-polyfill": "^0.12.0"
148148
},
149149
"installConfig": {

‎packages/extension/src/libs/background/index.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,11 @@ class BackgroundHandler {
9292
method === InternalMethods.newWindowUnload
9393
) {
9494
this.#persistentEvents.deleteEvents(_tabid);
95-
isGeoRestricted().then(restricted => {
96-
this.#geoRestricted = restricted;
97-
});
95+
if (this.#geoRestricted === undefined) {
96+
isGeoRestricted().then(restricted => {
97+
this.#geoRestricted = restricted;
98+
});
99+
}
98100
return {
99101
result: JSON.stringify(true),
100102
};

‎packages/extension/src/libs/utils/screening.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
const isGeoRestricted = async (): Promise<boolean> => {
2-
return fetch('https://partners.mewapi.io/o/ipcomply')
2+
return fetch('https://partners.mewapi.io/o/ipcomply/enkrypt')
33
.then(async res => {
44
if (res.ok) {
55
const json = await res.json();
66
return json.isRestricted;
77
}
8-
return false;
8+
return true;
99
})
10-
.catch(() => false);
10+
.catch(() => true);
1111
};
1212

1313
const walletCache: Record<string, boolean> = {};

‎packages/extension/src/providers/ethereum/libs/transaction/index.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@ class Transaction {
198198
chainId: BigInt(this.tx.chainId),
199199
defaultHardfork: Hardfork.London,
200200
});
201-
console.log(feeMarketTx);
202201
let finalizedTransaction = FeeMarketEIP1559Transaction.fromTxData(
203202
feeMarketTx as FinalizedFeeMarketEthereumTransaction,
204203
{

‎packages/extension/src/providers/ethereum/networks/eth.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ const ethOptions: EvmNetworkOptions = {
1010
name: NetworkNames.Ethereum,
1111
name_long: 'Ethereum',
1212
homePage: 'https://ethereum.org',
13-
blockExplorerTX: 'https://www.ethvm.com/tx/[[txHash]]',
14-
blockExplorerAddr: 'https://www.ethvm.com/address/[[address]]',
13+
blockExplorerTX: 'https://etherscan.io/tx/[[txHash]]',
14+
blockExplorerAddr: 'https://etherscan.io/address/[[address]]',
1515
chainID: '0x1',
1616
isTestNetwork: false,
1717
currencyName: 'ETH',

‎packages/hw-wallets/package.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,22 @@
2222
"node": ">=14.15.0"
2323
},
2424
"devDependencies": {
25-
"@types/node": "^25.5.0",
26-
"@typescript-eslint/eslint-plugin": "^8.58.0",
27-
"@typescript-eslint/parser": "^8.58.0",
25+
"@types/node": "^25.9.1",
26+
"@typescript-eslint/eslint-plugin": "^8.59.4",
27+
"@typescript-eslint/parser": "^8.59.4",
2828
"eslint": "^9.39.4",
2929
"eslint-config-airbnb-base": "^15.0.0",
3030
"eslint-config-prettier": "^10.1.8",
3131
"eslint-import-resolver-alias": "^1.1.2",
3232
"eslint-plugin-import": "^2.32.0",
3333
"eslint-plugin-module-resolver": "^1.5.0",
34-
"prettier": "^3.8.1",
34+
"prettier": "^3.8.3",
3535
"ts-node": "^10.9.2",
3636
"tsconfig-paths": "^4.2.0",
3737
"tsup": "^8.5.1",
3838
"typescript": "^5.9.3",
39-
"typescript-eslint": "8.58.0",
40-
"vitest": "^4.1.2"
39+
"typescript-eslint": "8.59.4",
40+
"vitest": "^4.1.7"
4141
},
4242
"repository": {
4343
"type": "git",
@@ -52,19 +52,19 @@
5252
"@ethereumjs/rlp": "^5.0.2",
5353
"@ethereumjs/tx": "^5.4.0",
5454
"@ethereumjs/util": "^9.1.0",
55-
"@ledgerhq/hw-app-btc": "^10.20.1",
56-
"@ledgerhq/hw-app-eth": "^7.6.2",
57-
"@ledgerhq/hw-app-solana": "^7.9.1",
58-
"@ledgerhq/hw-transport": "^6.34.1",
59-
"@ledgerhq/hw-transport-webusb": "^6.33.0",
55+
"@ledgerhq/hw-app-btc": "^10.22.1",
56+
"@ledgerhq/hw-app-eth": "^7.8.3",
57+
"@ledgerhq/hw-app-solana": "^7.10.2",
58+
"@ledgerhq/hw-transport": "^6.35.2",
59+
"@ledgerhq/hw-transport-webusb": "^6.34.2",
6060
"@ledgerhq/live-common": "^34.20.0",
6161
"@metamask/eth-sig-util": "^8.2.0",
6262
"@polkadot/types": "^16.5.6",
6363
"@polkadot/util": "^14.0.3",
64-
"@trezor/connect": "^9.7.2",
64+
"@trezor/connect": "^9.7.3",
6565
"@trezor/connect-plugin-ethereum": "^9.1.5",
66-
"@trezor/connect-web": "^9.7.2",
67-
"@trezor/connect-webextension": "^9.7.2",
66+
"@trezor/connect-web": "^9.7.3",
67+
"@trezor/connect-webextension": "^9.7.3",
6868
"@zondax/ledger-substrate": "^2.1.2",
6969
"bitcoinjs-lib": "^6.1.7",
7070
"bs58": "^6.0.0",

‎packages/keyring/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,22 @@
3535
"bip32": "2.0.6"
3636
},
3737
"devDependencies": {
38-
"@types/node": "^22.19.15",
39-
"@typescript-eslint/eslint-plugin": "^8.58.0",
40-
"@typescript-eslint/parser": "^8.58.0",
38+
"@types/node": "^22.19.19",
39+
"@typescript-eslint/eslint-plugin": "^8.59.4",
40+
"@typescript-eslint/parser": "^8.59.4",
4141
"eslint": "^9.39.4",
4242
"eslint-config-airbnb-base": "^15.0.0",
4343
"eslint-config-prettier": "^10.1.8",
4444
"eslint-import-resolver-alias": "^1.1.2",
4545
"eslint-plugin-import": "^2.32.0",
4646
"eslint-plugin-module-resolver": "^1.5.0",
47-
"prettier": "^3.8.1",
47+
"prettier": "^3.8.3",
4848
"ts-node": "^10.9.2",
4949
"tsconfig-paths": "^4.2.0",
5050
"tsup": "^8.5.1",
5151
"typescript": "^5.9.3",
52-
"typescript-eslint": "8.58.0",
53-
"vitest": "^4.1.2"
52+
"typescript-eslint": "8.59.4",
53+
"vitest": "^4.1.7"
5454
},
5555
"repository": {
5656
"type": "git",

‎packages/name-resolution/package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,23 @@
2222
"node": ">=14.15.0"
2323
},
2424
"devDependencies": {
25-
"@types/node": "^22.19.15",
26-
"@typescript-eslint/eslint-plugin": "^8.58.0",
27-
"@typescript-eslint/parser": "^8.58.0",
25+
"@types/node": "^22.19.19",
26+
"@typescript-eslint/eslint-plugin": "^8.59.4",
27+
"@typescript-eslint/parser": "^8.59.4",
2828
"eslint": "^9.39.4",
2929
"eslint-config-airbnb-base": "^15.0.0",
3030
"eslint-config-prettier": "^10.1.8",
3131
"eslint-import-resolver-alias": "^1.1.2",
3232
"eslint-plugin-import": "^2.32.0",
3333
"eslint-plugin-module-resolver": "^1.5.0",
34-
"prettier": "^3.8.1",
34+
"prettier": "^3.8.3",
3535
"ts-node": "^10.9.2",
3636
"tsconfig-paths": "^4.2.0",
3737
"tsup": "^8.5.1",
3838
"typescript": "^5.9.3",
39-
"typescript-eslint": "8.58.0",
40-
"viem": "^2.47.6",
41-
"vitest": "^4.1.2"
39+
"typescript-eslint": "8.59.4",
40+
"viem": "^2.50.4",
41+
"vitest": "^4.1.7"
4242
},
4343
"repository": {
4444
"type": "git",
@@ -48,7 +48,7 @@
4848
"author": "kvhnuke",
4949
"license": "MIT",
5050
"dependencies": {
51-
"@bonfida/spl-name-service": "3.0.20",
51+
"@bonfida/spl-name-service": "3.0.21",
5252
"@ensdomains/address-encoder": "^1.1.4",
5353
"@unstoppabledomains/resolution": "^9.3.3",
5454
"@web3-name-sdk/core": "0.4.2",

0 commit comments

Comments
 (0)