Skip to content

Commit ae5aa73

Browse files
kvhnukekvhnuke
authored
Merge pull request #761 from enkryptcom/develop
release: v2.13.0
2 parents c0b090a + 94a605d commit ae5aa73

46 files changed

Lines changed: 2450 additions & 2723 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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
"prepare": "husky"
3333
},
3434
"devDependencies": {
35-
"@commitlint/cli": "^19.8.1",
36-
"@commitlint/config-conventional": "^19.8.1",
37-
"@swc/core": "^1.13.5",
35+
"@commitlint/cli": "^20.0.0",
36+
"@commitlint/config-conventional": "^20.0.0",
37+
"@swc/core": "^1.13.19",
3838
"concurrently": "^9.2.1",
3939
"husky": "^9.1.7",
4040
"node-notifier": "^10.0.1",

‎packages/extension-bridge/package.json‎

Lines changed: 6 additions & 6 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.3",
47+
"@types/node": "^22.18.6",
4848
"@types/webextension-polyfill": "^0.12.3",
49-
"@typescript-eslint/eslint-plugin": "^8.44.0",
50-
"@typescript-eslint/parser": "^8.44.0",
49+
"@typescript-eslint/eslint-plugin": "^8.44.1",
50+
"@typescript-eslint/parser": "^8.44.1",
5151
"bumpp": "^10.2.3",
52-
"eslint": "^9.35.0",
52+
"eslint": "^9.36.0",
5353
"eslint-config-airbnb-base": "^15.0.0",
5454
"eslint-config-prettier": "^10.1.8",
5555
"eslint-import-resolver-alias": "^1.1.2",
@@ -59,8 +59,8 @@
5959
"ts-node": "^10.9.2",
6060
"tsconfig-paths": "^4.2.0",
6161
"tsup": "^8.5.0",
62-
"type-fest": "^4.41.0",
62+
"type-fest": "^5.0.1",
6363
"typescript": "^5.9.2",
64-
"typescript-eslint": "8.44.0"
64+
"typescript-eslint": "8.44.1"
6565
}
6666
}

‎packages/extension/package.json‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@enkryptcom/extension",
3-
"version": "2.12.0",
3+
"version": "2.13.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.24.0",
26+
"@amplitude/analytics-browser": "^2.25.0",
2727
"@enkryptcom/extension-bridge": "workspace:^",
2828
"@enkryptcom/hw-wallets": "workspace:^",
2929
"@enkryptcom/keyring": "workspace:^",
@@ -36,20 +36,20 @@
3636
"@ethereumjs/tx": "^5.4.0",
3737
"@ethereumjs/util": "^9.1.0",
3838
"@ethereumjs/wallet": "^2.0.4",
39-
"@kadena/client": "^1.18.0",
40-
"@kadena/pactjs-cli": "^1.18.0",
41-
"@ledgerhq/hw-transport-webusb": "^6.29.10",
39+
"@kadena/client": "^1.18.2",
40+
"@kadena/pactjs-cli": "^1.18.2",
41+
"@ledgerhq/hw-transport-webusb": "^6.29.11",
4242
"@massalabs/massa-web3": "^5.3.0",
4343
"@metamask/eth-sig-util": "^8.2.0",
4444
"@metaplex-foundation/mpl-bubblegum": "^5.0.2",
4545
"@metaplex-foundation/umi": "^1.4.1",
4646
"@metaplex-foundation/umi-bundle-defaults": "^1.4.1",
47-
"@polkadot/api": "^16.4.7",
48-
"@polkadot/extension-inject": "^0.61.7",
47+
"@polkadot/api": "^16.4.8",
48+
"@polkadot/extension-inject": "^0.62.1",
4949
"@polkadot/keyring": "^13.5.6",
50-
"@polkadot/rpc-provider": "^16.4.7",
51-
"@polkadot/types": "^16.4.7",
52-
"@polkadot/types-known": "^16.4.7",
50+
"@polkadot/rpc-provider": "^16.4.8",
51+
"@polkadot/types": "^16.4.8",
52+
"@polkadot/types-known": "^16.4.8",
5353
"@polkadot/ui-shared": "^3.16.1",
5454
"@polkadot/util": "^13.5.6",
5555
"@polkadot/wasm-crypto": "^7.5.1",
@@ -78,8 +78,8 @@
7878
"qrcode.vue": "^3.6.0",
7979
"switch-ts": "^1.1.1",
8080
"url-parse": "^1.5.10",
81-
"uuid": "^11.1.0",
82-
"vue": "^3.5.21",
81+
"uuid": "^13.0.0",
82+
"vue": "^3.5.22",
8383
"vue-echarts": "7.0.3",
8484
"vue-router": "^4.5.1",
8585
"vue3-lottie": "^3.3.1",
@@ -100,17 +100,17 @@
100100
"@rollup/plugin-typescript": "^12.1.4",
101101
"@tsconfig/node20": "^20.1.6",
102102
"@types/bs58": "^5.0.0",
103-
"@types/chrome": "^0.1.11",
103+
"@types/chrome": "^0.1.12",
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",
108108
"@types/lodash": "^4.17.20",
109-
"@types/node": "^22.18.3",
109+
"@types/node": "^22.18.6",
110110
"@types/semver": "^7.7.1",
111111
"@types/url-parse": "^1.4.11",
112112
"@types/utf-8-validate": "^5.0.2",
113-
"@types/uuid": "^10.0.0",
113+
"@types/uuid": "^11.0.0",
114114
"@types/wif": "^2.0.5",
115115
"@types/zxcvbn": "^4.4.5",
116116
"@vitejs/plugin-vue": "^6.0.1",
@@ -119,27 +119,27 @@
119119
"@vue/tsconfig": "^0.8.1",
120120
"@vueuse/core": "^13.9.0",
121121
"cross-env": "^10.0.0",
122-
"eslint": "^9.35.0",
123-
"eslint-plugin-vue": "^10.4.0",
122+
"eslint": "^9.36.0",
123+
"eslint-plugin-vue": "^10.5.0",
124124
"fs-extra": "^11.3.2",
125125
"jsdom": "^26.1.0",
126126
"less": "^4.4.1",
127127
"less-loader": "^12.3.0",
128128
"npm-run-all2": "^8.0.4",
129129
"prettier": "^3.6.2",
130130
"rimraf": "^6.0.1",
131-
"rollup": "^4.50.2",
131+
"rollup": "^4.52.2",
132132
"rollup-plugin-visualizer": "^6.0.3",
133133
"semver": "^7.7.2",
134-
"systeminformation": "^5.27.9",
134+
"systeminformation": "^5.27.10",
135135
"tsup": "^8.5.0",
136136
"typescript": "~5.9.2",
137137
"url": "^0.11.4",
138-
"vite": "^7.1.5",
138+
"vite": "^7.1.7",
139139
"vite-plugin-node-polyfills": "0.24.0",
140140
"vite-tsconfig-paths": "^5.1.4",
141141
"vitest": "^3.2.4",
142-
"vue-tsc": "^3.0.7",
142+
"vue-tsc": "^3.0.8",
143143
"webextension-polyfill": "^0.12.0"
144144
},
145145
"installConfig": {

‎packages/extension/src/providers/common/libs/new-features.ts‎

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[] = [NetworkNames.Massa];
3+
const newNetworks: NetworkNames[] = [];
44
const newSwaps: NetworkNames[] = [];
55

66
export { newNetworks, newSwaps };

‎packages/extension/src/providers/ethereum/libs/activity-handlers/providers/etherscan/configs.ts‎

Lines changed: 60 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,75 @@
11
import { NetworkNames } from '@enkryptcom/types';
22

33
const NetworkEndpoints: Record<string, string> = {
4-
[NetworkNames.Ethereum]: 'https://eth.blockscout.com/',
5-
[NetworkNames.Binance]: 'https://api.bscscan.com/',
6-
[NetworkNames.Matic]: 'https://polygon.blockscout.com/',
7-
[NetworkNames.Moonbeam]: 'https://api-moonbeam.moonscan.io/',
8-
[NetworkNames.Moonriver]: 'https://api-moonriver.moonscan.io/',
9-
[NetworkNames.KaruraEVM]: 'https://blockscout.karura.network/',
10-
[NetworkNames.AstarEVM]: 'https://blockscout.com/astar/',
11-
[NetworkNames.ShidenEVM]: 'https://blockscout.com/shiden/',
12-
[NetworkNames.Optimism]: 'https://api-optimistic.etherscan.io/',
13-
[NetworkNames.EdgeEVM]: 'https://edgscan.live/',
14-
[NetworkNames.Rootstock]: 'https://blockscout.com/rsk/mainnet/',
15-
[NetworkNames.RootstockTestnet]: 'https://rootstock-testnet.blockscout.com/',
4+
[NetworkNames.Ethereum]: 'https://eth.blockscout.com/api?',
5+
[NetworkNames.Binance]: 'https://api.etherscan.io/v2/api?chainid=56&',
6+
[NetworkNames.Matic]: 'https://polygon.blockscout.com/api?',
7+
[NetworkNames.Moonbeam]: 'https://api.etherscan.io/v2/api?chainid=1284&',
8+
[NetworkNames.Moonriver]: 'https://api.etherscan.io/v2/api?chainid=1285&',
9+
[NetworkNames.KaruraEVM]: 'https://blockscout.karura.network/api?',
10+
[NetworkNames.AstarEVM]: 'https://blockscout.com/astar/api?',
11+
[NetworkNames.ShidenEVM]: 'https://blockscout.com/shiden/api?',
12+
[NetworkNames.Optimism]: 'https://api.etherscan.io/v2/api?chainid=10&',
13+
[NetworkNames.EdgeEVM]: 'https://edgscan.live/api?',
14+
[NetworkNames.Rootstock]: 'https://blockscout.com/rsk/mainnet/api?',
15+
[NetworkNames.RootstockTestnet]:
16+
'https://rootstock-testnet.blockscout.com/api?',
1617
[NetworkNames.SkaleBlockBrawlers]:
17-
'https://frayed-decent-antares.explorer.mainnet.skalenodes.com/',
18+
'https://frayed-decent-antares.explorer.mainnet.skalenodes.com/api?',
1819
[NetworkNames.SkaleCalypso]:
19-
'https://honorable-steel-rasalhague.explorer.mainnet.skalenodes.com/',
20+
'https://honorable-steel-rasalhague.explorer.mainnet.skalenodes.com/api?',
2021
[NetworkNames.SkaleCryptoBlades]:
21-
'https://affectionate-immediate-pollux.explorer.mainnet.skalenodes.com/',
22+
'https://affectionate-immediate-pollux.explorer.mainnet.skalenodes.com/api?',
2223
[NetworkNames.SkaleCryptoColosseum]:
23-
'https://haunting-devoted-deneb.explorer.mainnet.skalenodes.com/',
24+
'https://haunting-devoted-deneb.explorer.mainnet.skalenodes.com/api?',
2425
[NetworkNames.SkaleEuropa]:
25-
'https://elated-tan-skat.explorer.mainnet.skalenodes.com/',
26+
'https://elated-tan-skat.explorer.mainnet.skalenodes.com/api?',
2627
[NetworkNames.SkaleExorde]:
27-
'https://light-vast-diphda.explorer.mainnet.skalenodes.com/',
28+
'https://light-vast-diphda.explorer.mainnet.skalenodes.com/api?',
2829
[NetworkNames.SkaleNebula]:
29-
'https://green-giddy-denebola.explorer.mainnet.skalenodes.com/',
30+
'https://green-giddy-denebola.explorer.mainnet.skalenodes.com/api?',
3031
[NetworkNames.SkaleTitan]:
31-
'https://parallel-stormy-spica.explorer.mainnet.skalenodes.com/',
32-
[NetworkNames.ZkSync]: 'https://block-explorer-api.mainnet.zksync.io/',
33-
[NetworkNames.Arbitrum]: 'https://api.arbiscan.io/',
34-
[NetworkNames.ArbitrumNova]: 'https://nova-explorer.arbitrum.io/',
35-
[NetworkNames.Gnosis]: 'https://api.gnosisscan.io/',
36-
[NetworkNames.Avalanche]: 'https://api.snowtrace.io/',
37-
[NetworkNames.Aurora]: 'https://explorer.mainnet.aurora.dev/',
38-
[NetworkNames.PuppyNet]: 'https://puppyscan.shib.io/',
39-
[NetworkNames.Shibarium]: 'https://www.shibariumscan.io/',
40-
[NetworkNames.MaticZK]: 'https://api-zkevm.polygonscan.com/',
41-
[NetworkNames.Base]: 'https://api.basescan.org/',
42-
[NetworkNames.Celo]: 'https://explorer.celo.org/mainnet/',
43-
[NetworkNames.SyscoinNEVMTest]: 'https://explorer.tanenbaum.io/',
44-
[NetworkNames.SyscoinNEVM]: 'https://explorer.syscoin.org/',
45-
[NetworkNames.RolluxTest]: 'https://rollux.tanenbaum.io/',
46-
[NetworkNames.Rollux]: 'https://explorer.rollux.com/',
47-
[NetworkNames.Blast]: 'https://api.blastscan.io/',
48-
[NetworkNames.Sanko]: 'https://explorer.sanko.xyz/',
49-
[NetworkNames.Sonic]: 'https://api.sonicscan.org/',
50-
[NetworkNames.Degen]: 'https://explorer.degen.tips/',
51-
[NetworkNames.Ink]: 'https://explorer.inkonchain.com/',
52-
[NetworkNames.ImmutableZkevm]: 'https://explorer.immutable.com/',
53-
[NetworkNames.Rari]: 'https://mainnet.explorer.rarichain.org/',
54-
[NetworkNames.Forma]: 'https://explorer.forma.art/',
55-
[NetworkNames.XLayer]: 'https://www.oklink.com/api/v5/explorer/xlayer/',
56-
[NetworkNames.Linea]: 'https://api.lineascan.build/',
57-
[NetworkNames.MantaPacific]: 'https://pacific-explorer.manta.network/',
58-
[NetworkNames.Mode]: 'https://explorer.mode.network/',
59-
[NetworkNames.ProofOfPlayApex]: 'https://explorer.apex.proofofplay.com/',
60-
[NetworkNames.Scroll]: 'https://api.scrollscan.com/',
61-
[NetworkNames.Fraxtal]: 'https://api.fraxscan.com/',
62-
[NetworkNames.Coti]: 'https://mainnet.cotiscan.io/',
32+
'https://parallel-stormy-spica.explorer.mainnet.skalenodes.com/api?',
33+
[NetworkNames.ZkSync]: 'https://block-explorer-api.mainnet.zksync.io/api?',
34+
[NetworkNames.Arbitrum]: 'https://api.etherscan.io/v2/api?chainid=42161&',
35+
[NetworkNames.ArbitrumNova]: 'https://api.etherscan.io/v2/api?chainid=42170&',
36+
[NetworkNames.Gnosis]: 'https://api.etherscan.io/v2/api?chainid=100&',
37+
[NetworkNames.Avalanche]: 'https://api.snowtrace.io/api?',
38+
[NetworkNames.Aurora]: 'https://explorer.mainnet.aurora.dev/api?',
39+
[NetworkNames.PuppyNet]: 'https://puppyscan.shib.io/api?',
40+
[NetworkNames.Shibarium]: 'https://www.shibariumscan.io/api?',
41+
[NetworkNames.MaticZK]: 'https://api.etherscan.io/v2/api?chainid=1101&',
42+
[NetworkNames.Base]: 'https://api.etherscan.io/v2/api?chainid=8453&',
43+
[NetworkNames.Celo]: 'https://explorer.celo.org/mainnet/api?',
44+
[NetworkNames.SyscoinNEVMTest]: 'https://explorer.tanenbaum.io/api?',
45+
[NetworkNames.SyscoinNEVM]: 'https://explorer.syscoin.org/api?',
46+
[NetworkNames.RolluxTest]: 'https://rollux.tanenbaum.io/api?',
47+
[NetworkNames.Rollux]: 'https://explorer.rollux.com/api?',
48+
[NetworkNames.Blast]: 'https://api.etherscan.io/v2/api?chainid=81457&',
49+
[NetworkNames.Sanko]: 'https://explorer.sanko.xyz/api?',
50+
[NetworkNames.Sonic]: 'https://api.etherscan.io/v2/api?chainid=146&',
51+
[NetworkNames.Degen]: 'https://explorer.degen.tips/api?',
52+
[NetworkNames.Ink]: 'https://explorer.inkonchain.com/api?',
53+
[NetworkNames.ImmutableZkevm]: 'https://explorer.immutable.com/api?',
54+
[NetworkNames.Rari]: 'https://mainnet.explorer.rarichain.org/api?',
55+
[NetworkNames.Forma]: 'https://explorer.forma.art/api?',
56+
[NetworkNames.XLayer]: 'https://www.oklink.com/api/v5/explorer/xlayer/api?',
57+
[NetworkNames.Linea]: 'https://api.lineascan.build/api?',
58+
[NetworkNames.MantaPacific]: 'https://pacific-explorer.manta.network/api?',
59+
[NetworkNames.Mode]: 'https://explorer.mode.network/api?',
60+
[NetworkNames.ProofOfPlayApex]: 'https://explorer.apex.proofofplay.com/api?',
61+
[NetworkNames.Scroll]: 'https://api.scrollscan.com/api?',
62+
[NetworkNames.Fraxtal]: 'https://api.etherscan.io/v2/api?chainid=252&',
63+
[NetworkNames.Coti]: 'https://mainnet.cotiscan.io/api?',
6364
[NetworkNames.CytonicTestnet]:
64-
'https://explorer-api.evm.testnet.cytonic.com/api/',
65-
[NetworkNames.Derive]: 'https://explorer.derive.xyz/',
66-
[NetworkNames.Conflux]: 'https://evmapi.confluxscan.org/',
67-
[NetworkNames.Hemi]: 'https://explorer.hemi.xyz/',
68-
[NetworkNames.AppLayerTestnet]: 'https://testnet-explorer.applayer.com/api/',
69-
[NetworkNames.EthereumClassic]: 'https://etc.blockscout.com/',
70-
[NetworkNames.TAC]: 'https://explorer.tac.build/',
65+
'https://explorer-api.evm.testnet.cytonic.com/api/api?',
66+
[NetworkNames.Derive]: 'https://explorer.derive.xyz/api?',
67+
[NetworkNames.Conflux]: 'https://evmapi.confluxscan.org/api?',
68+
[NetworkNames.Hemi]: 'https://explorer.hemi.xyz/api?',
69+
[NetworkNames.AppLayerTestnet]:
70+
'https://testnet-explorer.applayer.com/api/api?',
71+
[NetworkNames.EthereumClassic]: 'https://etc.blockscout.com/api?',
72+
[NetworkNames.TAC]: 'https://explorer.tac.build/api?',
7173
};
7274

7375
export { NetworkEndpoints };

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const getAddressActivity = async (
2121
return cacheFetch(
2222
{
2323
// Note: would like to add offset=50 (i.e. results per page) but it seems to cause polygon API to hang
24-
url: `${endpoint}api?module=account&action=txlist&address=${address}&sort=desc`,
24+
url: `${endpoint}module=account&action=txlist&address=${address}&sort=desc`,
2525
headers,
2626
},
2727
TTL,

‎packages/extension/src/ui/action/components/app-menu/index.vue‎

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,12 @@
165165
@close="closeSolanaStakingBanner"
166166
/>
167167

168-
<survey-popup
168+
<!-- Leaving this here for future use -->
169+
<!-- <survey-popup
169170
v-else-if="isSurveyPopup && isExpanded"
170171
key="survey-popup"
171172
@close="closeSurveyPopup"
172-
/>
173+
/> -->
173174
</Transition>
174175
</div>
175176
</template>
@@ -216,7 +217,6 @@ import SearchIcon from '@action/icons/common/search.vue';
216217
import { useMenuStore } from '@action/store/menu-store';
217218
import SolanaStakingBanner from './components/solana-staking-banner.vue';
218219
import BannersState from '@/libs/banners-state';
219-
import SurveyPopup from './components/survey-popup.vue';
220220
221221
const appMenuRef = ref(null);
222222
@@ -279,9 +279,6 @@ onMounted(async () => {
279279
net => !usedNetworks.swap.includes(net),
280280
);
281281
isSolanaStakingBanner.value = await bannersState.showSolanaStakingBanner();
282-
if (!isSolanaStakingBanner.value) {
283-
openSurveyPopup();
284-
}
285282
});
286283
287284
/** -------------------
@@ -553,27 +550,12 @@ const updateGradient = (newGradient: string) => {
553550
* Banners
554551
------------------*/
555552
const isSolanaStakingBanner = ref(false);
556-
const isSurveyPopup = ref(false);
557553
558554
const bannersState = new BannersState();
559555
560-
const openSurveyPopup = async () => {
561-
if (await bannersState.showSurveyPopup()) {
562-
setTimeout(() => {
563-
isSurveyPopup.value = true;
564-
}, 4000);
565-
}
566-
};
567-
568-
const closeSurveyPopup = () => {
569-
isSurveyPopup.value = false;
570-
bannersState.hideSurveyPopup();
571-
};
572-
573556
const closeSolanaStakingBanner = () => {
574557
isSolanaStakingBanner.value = false;
575558
bannersState.hideSolanaStakingBanner();
576-
openSurveyPopup();
577559
};
578560
</script>
579561

‎packages/extension/src/ui/action/views/swap-initiated/index.vue‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,13 @@
2424
:loop="true"
2525
class="swap-initiated__loading"
2626
/>
27-
<p v-if="isHardware">
27+
<p v-if="isHardware && !waitingToBeMined">
2828
Follow further instructions on your hardware wallet device
2929
</p>
30+
<p v-if="waitingToBeMined">
31+
Waiting for Transactions to be mined, this can take upto 30
32+
seconds
33+
</p>
3034
</div>
3135

3236
<div v-if="!isLoading && !isError">
@@ -91,6 +95,7 @@ interface IProps {
9195
isLoading: boolean;
9296
isHardware: boolean;
9397
isError: boolean;
98+
waitingToBeMined: boolean;
9499
errorMessage: string;
95100
network: BaseNetwork;
96101
}

0 commit comments

Comments
 (0)