Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
d6ebdeb
devop: swap oneinchfusion provider
kvhnuke Sep 9, 2025
89f5568
devop: properly pass rfq data
kvhnuke Sep 9, 2025
d6679ab
devop: waiting for source approval
kvhnuke Sep 10, 2025
784afe8
devop: waiting for source approval
kvhnuke Sep 10, 2025
ba77b24
fix: no tx bufs
kvhnuke Sep 11, 2025
c4b6a6a
Merge branch 'develop' into feat/oneinch-fusion
kvhnuke Sep 16, 2025
2dd68bf
devop: minor swap changes
kvhnuke Sep 16, 2025
3170c85
fix: fusion swap
kvhnuke Sep 16, 2025
c8edc6e
fix: etherscan urls
kvhnuke Sep 22, 2025
c4adbd2
devop: remove 1inch fusion orders below 0
kvhnuke Sep 24, 2025
85f9c49
devop: remove survey
gamalielhere Sep 24, 2025
3a889d8
fix: tests
kvhnuke Sep 25, 2025
4df768d
fix: tests
kvhnuke Sep 25, 2025
ecabe0e
devop: upgrade packages
kvhnuke Sep 25, 2025
8399873
Merge pull request #759 from enkryptcom/devop/remove-survey
kvhnuke Sep 25, 2025
73d525d
Merge pull request #758 from enkryptcom/devop/migrate-etherscan-v2
kvhnuke Sep 25, 2025
5bb621f
devop: remove console.logs
kvhnuke Sep 25, 2025
5bb1fec
devop: merge
kvhnuke Sep 25, 2025
c98c6aa
devop: bump version
kvhnuke Sep 25, 2025
7a088c2
devop: remove undefined var
kvhnuke Sep 25, 2025
edad321
fix: massa sha512
kvhnuke Sep 29, 2025
f60316c
fix: massa sha512
kvhnuke Sep 29, 2025
eba1e19
devop: remove log
kvhnuke Sep 30, 2025
8abcd00
devop: remove console.log
kvhnuke Oct 1, 2025
1a423d4
fix: jup swap
kvhnuke Oct 1, 2025
3969621
Merge pull request #760 from enkryptcom/devop/release-v-2-13
kvhnuke Oct 2, 2025
94a605d
Merge pull request #762 from enkryptcom/main
kvhnuke Oct 2, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
"prepare": "husky"
},
"devDependencies": {
"@commitlint/cli": "^19.8.1",
"@commitlint/config-conventional": "^19.8.1",
"@swc/core": "^1.13.5",
"@commitlint/cli": "^20.0.0",
"@commitlint/config-conventional": "^20.0.0",
"@swc/core": "^1.13.19",
"concurrently": "^9.2.1",
"husky": "^9.1.7",
"node-notifier": "^10.0.1",
Expand Down
12 changes: 6 additions & 6 deletions packages/extension-bridge/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@
"webextension-polyfill": "^0.12.0"
},
"devDependencies": {
"@types/node": "^22.18.3",
"@types/node": "^22.18.6",
"@types/webextension-polyfill": "^0.12.3",
"@typescript-eslint/eslint-plugin": "^8.44.0",
"@typescript-eslint/parser": "^8.44.0",
"@typescript-eslint/eslint-plugin": "^8.44.1",
"@typescript-eslint/parser": "^8.44.1",
"bumpp": "^10.2.3",
"eslint": "^9.35.0",
"eslint": "^9.36.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-prettier": "^10.1.8",
"eslint-import-resolver-alias": "^1.1.2",
Expand All @@ -59,8 +59,8 @@
"ts-node": "^10.9.2",
"tsconfig-paths": "^4.2.0",
"tsup": "^8.5.0",
"type-fest": "^4.41.0",
"type-fest": "^5.0.1",
"typescript": "^5.9.2",
"typescript-eslint": "8.44.0"
"typescript-eslint": "8.44.1"
}
}
42 changes: 21 additions & 21 deletions packages/extension/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@enkryptcom/extension",
"version": "2.12.0",
"version": "2.13.0",
"private": true,
"type": "module",
"scripts": {
Expand All @@ -23,7 +23,7 @@
"watch:firefox": "yarn prebuild && cross-env BROWSER='firefox' vite"
},
"dependencies": {
"@amplitude/analytics-browser": "^2.24.0",
"@amplitude/analytics-browser": "^2.25.0",
"@enkryptcom/extension-bridge": "workspace:^",
"@enkryptcom/hw-wallets": "workspace:^",
"@enkryptcom/keyring": "workspace:^",
Expand All @@ -36,20 +36,20 @@
"@ethereumjs/tx": "^5.4.0",
"@ethereumjs/util": "^9.1.0",
"@ethereumjs/wallet": "^2.0.4",
"@kadena/client": "^1.18.0",
"@kadena/pactjs-cli": "^1.18.0",
"@ledgerhq/hw-transport-webusb": "^6.29.10",
"@kadena/client": "^1.18.2",
"@kadena/pactjs-cli": "^1.18.2",
"@ledgerhq/hw-transport-webusb": "^6.29.11",
"@massalabs/massa-web3": "^5.3.0",
"@metamask/eth-sig-util": "^8.2.0",
"@metaplex-foundation/mpl-bubblegum": "^5.0.2",
"@metaplex-foundation/umi": "^1.4.1",
"@metaplex-foundation/umi-bundle-defaults": "^1.4.1",
"@polkadot/api": "^16.4.7",
"@polkadot/extension-inject": "^0.61.7",
"@polkadot/api": "^16.4.8",
"@polkadot/extension-inject": "^0.62.1",
"@polkadot/keyring": "^13.5.6",
"@polkadot/rpc-provider": "^16.4.7",
"@polkadot/types": "^16.4.7",
"@polkadot/types-known": "^16.4.7",
"@polkadot/rpc-provider": "^16.4.8",
"@polkadot/types": "^16.4.8",
"@polkadot/types-known": "^16.4.8",
"@polkadot/ui-shared": "^3.16.1",
"@polkadot/util": "^13.5.6",
"@polkadot/wasm-crypto": "^7.5.1",
Expand Down Expand Up @@ -78,8 +78,8 @@
"qrcode.vue": "^3.6.0",
"switch-ts": "^1.1.1",
"url-parse": "^1.5.10",
"uuid": "^11.1.0",
"vue": "^3.5.21",
"uuid": "^13.0.0",
"vue": "^3.5.22",
"vue-echarts": "7.0.3",
"vue-router": "^4.5.1",
"vue3-lottie": "^3.3.1",
Expand All @@ -100,17 +100,17 @@
"@rollup/plugin-typescript": "^12.1.4",
"@tsconfig/node20": "^20.1.6",
"@types/bs58": "^5.0.0",
"@types/chrome": "^0.1.11",
"@types/chrome": "^0.1.12",
"@types/ethereumjs-abi": "^0.6.5",
"@types/events": "^3.0.3",
"@types/fs-extra": "^11.0.4",
"@types/less": "^3.0.8",
"@types/lodash": "^4.17.20",
"@types/node": "^22.18.3",
"@types/node": "^22.18.6",
"@types/semver": "^7.7.1",
"@types/url-parse": "^1.4.11",
"@types/utf-8-validate": "^5.0.2",
"@types/uuid": "^10.0.0",
"@types/uuid": "^11.0.0",
"@types/wif": "^2.0.5",
"@types/zxcvbn": "^4.4.5",
"@vitejs/plugin-vue": "^6.0.1",
Expand All @@ -119,27 +119,27 @@
"@vue/tsconfig": "^0.8.1",
"@vueuse/core": "^13.9.0",
"cross-env": "^10.0.0",
"eslint": "^9.35.0",
"eslint-plugin-vue": "^10.4.0",
"eslint": "^9.36.0",
"eslint-plugin-vue": "^10.5.0",
"fs-extra": "^11.3.2",
"jsdom": "^26.1.0",
"less": "^4.4.1",
"less-loader": "^12.3.0",
"npm-run-all2": "^8.0.4",
"prettier": "^3.6.2",
"rimraf": "^6.0.1",
"rollup": "^4.50.2",
"rollup": "^4.52.2",
"rollup-plugin-visualizer": "^6.0.3",
"semver": "^7.7.2",
"systeminformation": "^5.27.9",
"systeminformation": "^5.27.10",
"tsup": "^8.5.0",
"typescript": "~5.9.2",
"url": "^0.11.4",
"vite": "^7.1.5",
"vite": "^7.1.7",
"vite-plugin-node-polyfills": "0.24.0",
"vite-tsconfig-paths": "^5.1.4",
"vitest": "^3.2.4",
"vue-tsc": "^3.0.7",
"vue-tsc": "^3.0.8",
"webextension-polyfill": "^0.12.0"
},
"installConfig": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { NetworkNames } from '@enkryptcom/types';

const newNetworks: NetworkNames[] = [NetworkNames.Massa];
const newNetworks: NetworkNames[] = [];
const newSwaps: NetworkNames[] = [];

export { newNetworks, newSwaps };
Original file line number Diff line number Diff line change
@@ -1,73 +1,75 @@
import { NetworkNames } from '@enkryptcom/types';

const NetworkEndpoints: Record<string, string> = {
[NetworkNames.Ethereum]: 'https://eth.blockscout.com/',
[NetworkNames.Binance]: 'https://api.bscscan.com/',
[NetworkNames.Matic]: 'https://polygon.blockscout.com/',
[NetworkNames.Moonbeam]: 'https://api-moonbeam.moonscan.io/',
[NetworkNames.Moonriver]: 'https://api-moonriver.moonscan.io/',
[NetworkNames.KaruraEVM]: 'https://blockscout.karura.network/',
[NetworkNames.AstarEVM]: 'https://blockscout.com/astar/',
[NetworkNames.ShidenEVM]: 'https://blockscout.com/shiden/',
[NetworkNames.Optimism]: 'https://api-optimistic.etherscan.io/',
[NetworkNames.EdgeEVM]: 'https://edgscan.live/',
[NetworkNames.Rootstock]: 'https://blockscout.com/rsk/mainnet/',
[NetworkNames.RootstockTestnet]: 'https://rootstock-testnet.blockscout.com/',
[NetworkNames.Ethereum]: 'https://eth.blockscout.com/api?',
[NetworkNames.Binance]: 'https://api.etherscan.io/v2/api?chainid=56&',
[NetworkNames.Matic]: 'https://polygon.blockscout.com/api?',
[NetworkNames.Moonbeam]: 'https://api.etherscan.io/v2/api?chainid=1284&',
[NetworkNames.Moonriver]: 'https://api.etherscan.io/v2/api?chainid=1285&',
[NetworkNames.KaruraEVM]: 'https://blockscout.karura.network/api?',
[NetworkNames.AstarEVM]: 'https://blockscout.com/astar/api?',
[NetworkNames.ShidenEVM]: 'https://blockscout.com/shiden/api?',
[NetworkNames.Optimism]: 'https://api.etherscan.io/v2/api?chainid=10&',
[NetworkNames.EdgeEVM]: 'https://edgscan.live/api?',
[NetworkNames.Rootstock]: 'https://blockscout.com/rsk/mainnet/api?',
[NetworkNames.RootstockTestnet]:
'https://rootstock-testnet.blockscout.com/api?',
[NetworkNames.SkaleBlockBrawlers]:
'https://frayed-decent-antares.explorer.mainnet.skalenodes.com/',
'https://frayed-decent-antares.explorer.mainnet.skalenodes.com/api?',
[NetworkNames.SkaleCalypso]:
'https://honorable-steel-rasalhague.explorer.mainnet.skalenodes.com/',
'https://honorable-steel-rasalhague.explorer.mainnet.skalenodes.com/api?',
[NetworkNames.SkaleCryptoBlades]:
'https://affectionate-immediate-pollux.explorer.mainnet.skalenodes.com/',
'https://affectionate-immediate-pollux.explorer.mainnet.skalenodes.com/api?',
[NetworkNames.SkaleCryptoColosseum]:
'https://haunting-devoted-deneb.explorer.mainnet.skalenodes.com/',
'https://haunting-devoted-deneb.explorer.mainnet.skalenodes.com/api?',
[NetworkNames.SkaleEuropa]:
'https://elated-tan-skat.explorer.mainnet.skalenodes.com/',
'https://elated-tan-skat.explorer.mainnet.skalenodes.com/api?',
[NetworkNames.SkaleExorde]:
'https://light-vast-diphda.explorer.mainnet.skalenodes.com/',
'https://light-vast-diphda.explorer.mainnet.skalenodes.com/api?',
[NetworkNames.SkaleNebula]:
'https://green-giddy-denebola.explorer.mainnet.skalenodes.com/',
'https://green-giddy-denebola.explorer.mainnet.skalenodes.com/api?',
[NetworkNames.SkaleTitan]:
'https://parallel-stormy-spica.explorer.mainnet.skalenodes.com/',
[NetworkNames.ZkSync]: 'https://block-explorer-api.mainnet.zksync.io/',
[NetworkNames.Arbitrum]: 'https://api.arbiscan.io/',
[NetworkNames.ArbitrumNova]: 'https://nova-explorer.arbitrum.io/',
[NetworkNames.Gnosis]: 'https://api.gnosisscan.io/',
[NetworkNames.Avalanche]: 'https://api.snowtrace.io/',
[NetworkNames.Aurora]: 'https://explorer.mainnet.aurora.dev/',
[NetworkNames.PuppyNet]: 'https://puppyscan.shib.io/',
[NetworkNames.Shibarium]: 'https://www.shibariumscan.io/',
[NetworkNames.MaticZK]: 'https://api-zkevm.polygonscan.com/',
[NetworkNames.Base]: 'https://api.basescan.org/',
[NetworkNames.Celo]: 'https://explorer.celo.org/mainnet/',
[NetworkNames.SyscoinNEVMTest]: 'https://explorer.tanenbaum.io/',
[NetworkNames.SyscoinNEVM]: 'https://explorer.syscoin.org/',
[NetworkNames.RolluxTest]: 'https://rollux.tanenbaum.io/',
[NetworkNames.Rollux]: 'https://explorer.rollux.com/',
[NetworkNames.Blast]: 'https://api.blastscan.io/',
[NetworkNames.Sanko]: 'https://explorer.sanko.xyz/',
[NetworkNames.Sonic]: 'https://api.sonicscan.org/',
[NetworkNames.Degen]: 'https://explorer.degen.tips/',
[NetworkNames.Ink]: 'https://explorer.inkonchain.com/',
[NetworkNames.ImmutableZkevm]: 'https://explorer.immutable.com/',
[NetworkNames.Rari]: 'https://mainnet.explorer.rarichain.org/',
[NetworkNames.Forma]: 'https://explorer.forma.art/',
[NetworkNames.XLayer]: 'https://www.oklink.com/api/v5/explorer/xlayer/',
[NetworkNames.Linea]: 'https://api.lineascan.build/',
[NetworkNames.MantaPacific]: 'https://pacific-explorer.manta.network/',
[NetworkNames.Mode]: 'https://explorer.mode.network/',
[NetworkNames.ProofOfPlayApex]: 'https://explorer.apex.proofofplay.com/',
[NetworkNames.Scroll]: 'https://api.scrollscan.com/',
[NetworkNames.Fraxtal]: 'https://api.fraxscan.com/',
[NetworkNames.Coti]: 'https://mainnet.cotiscan.io/',
'https://parallel-stormy-spica.explorer.mainnet.skalenodes.com/api?',
[NetworkNames.ZkSync]: 'https://block-explorer-api.mainnet.zksync.io/api?',
[NetworkNames.Arbitrum]: 'https://api.etherscan.io/v2/api?chainid=42161&',
[NetworkNames.ArbitrumNova]: 'https://api.etherscan.io/v2/api?chainid=42170&',
[NetworkNames.Gnosis]: 'https://api.etherscan.io/v2/api?chainid=100&',
[NetworkNames.Avalanche]: 'https://api.snowtrace.io/api?',
[NetworkNames.Aurora]: 'https://explorer.mainnet.aurora.dev/api?',
[NetworkNames.PuppyNet]: 'https://puppyscan.shib.io/api?',
[NetworkNames.Shibarium]: 'https://www.shibariumscan.io/api?',
[NetworkNames.MaticZK]: 'https://api.etherscan.io/v2/api?chainid=1101&',
[NetworkNames.Base]: 'https://api.etherscan.io/v2/api?chainid=8453&',
[NetworkNames.Celo]: 'https://explorer.celo.org/mainnet/api?',
[NetworkNames.SyscoinNEVMTest]: 'https://explorer.tanenbaum.io/api?',
[NetworkNames.SyscoinNEVM]: 'https://explorer.syscoin.org/api?',
[NetworkNames.RolluxTest]: 'https://rollux.tanenbaum.io/api?',
[NetworkNames.Rollux]: 'https://explorer.rollux.com/api?',
[NetworkNames.Blast]: 'https://api.etherscan.io/v2/api?chainid=81457&',
[NetworkNames.Sanko]: 'https://explorer.sanko.xyz/api?',
[NetworkNames.Sonic]: 'https://api.etherscan.io/v2/api?chainid=146&',
[NetworkNames.Degen]: 'https://explorer.degen.tips/api?',
[NetworkNames.Ink]: 'https://explorer.inkonchain.com/api?',
[NetworkNames.ImmutableZkevm]: 'https://explorer.immutable.com/api?',
[NetworkNames.Rari]: 'https://mainnet.explorer.rarichain.org/api?',
[NetworkNames.Forma]: 'https://explorer.forma.art/api?',
[NetworkNames.XLayer]: 'https://www.oklink.com/api/v5/explorer/xlayer/api?',
[NetworkNames.Linea]: 'https://api.lineascan.build/api?',
[NetworkNames.MantaPacific]: 'https://pacific-explorer.manta.network/api?',
[NetworkNames.Mode]: 'https://explorer.mode.network/api?',
[NetworkNames.ProofOfPlayApex]: 'https://explorer.apex.proofofplay.com/api?',
[NetworkNames.Scroll]: 'https://api.scrollscan.com/api?',
[NetworkNames.Fraxtal]: 'https://api.etherscan.io/v2/api?chainid=252&',
[NetworkNames.Coti]: 'https://mainnet.cotiscan.io/api?',
[NetworkNames.CytonicTestnet]:
'https://explorer-api.evm.testnet.cytonic.com/api/',
[NetworkNames.Derive]: 'https://explorer.derive.xyz/',
[NetworkNames.Conflux]: 'https://evmapi.confluxscan.org/',
[NetworkNames.Hemi]: 'https://explorer.hemi.xyz/',
[NetworkNames.AppLayerTestnet]: 'https://testnet-explorer.applayer.com/api/',
[NetworkNames.EthereumClassic]: 'https://etc.blockscout.com/',
[NetworkNames.TAC]: 'https://explorer.tac.build/',
'https://explorer-api.evm.testnet.cytonic.com/api/api?',
[NetworkNames.Derive]: 'https://explorer.derive.xyz/api?',
[NetworkNames.Conflux]: 'https://evmapi.confluxscan.org/api?',
[NetworkNames.Hemi]: 'https://explorer.hemi.xyz/api?',
[NetworkNames.AppLayerTestnet]:
'https://testnet-explorer.applayer.com/api/api?',
[NetworkNames.EthereumClassic]: 'https://etc.blockscout.com/api?',
[NetworkNames.TAC]: 'https://explorer.tac.build/api?',
};

export { NetworkEndpoints };
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const getAddressActivity = async (
return cacheFetch(
{
// Note: would like to add offset=50 (i.e. results per page) but it seems to cause polygon API to hang
url: `${endpoint}api?module=account&action=txlist&address=${address}&sort=desc`,
url: `${endpoint}module=account&action=txlist&address=${address}&sort=desc`,
headers,
},
TTL,
Expand Down
24 changes: 3 additions & 21 deletions packages/extension/src/ui/action/components/app-menu/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,12 @@
@close="closeSolanaStakingBanner"
/>

<survey-popup
<!-- Leaving this here for future use -->
<!-- <survey-popup
v-else-if="isSurveyPopup && isExpanded"
key="survey-popup"
@close="closeSurveyPopup"
/>
/> -->
</Transition>
</div>
</template>
Expand Down Expand Up @@ -216,7 +217,6 @@ import SearchIcon from '@action/icons/common/search.vue';
import { useMenuStore } from '@action/store/menu-store';
import SolanaStakingBanner from './components/solana-staking-banner.vue';
import BannersState from '@/libs/banners-state';
import SurveyPopup from './components/survey-popup.vue';

const appMenuRef = ref(null);

Expand Down Expand Up @@ -279,9 +279,6 @@ onMounted(async () => {
net => !usedNetworks.swap.includes(net),
);
isSolanaStakingBanner.value = await bannersState.showSolanaStakingBanner();
if (!isSolanaStakingBanner.value) {
openSurveyPopup();
}
});

/** -------------------
Expand Down Expand Up @@ -553,27 +550,12 @@ const updateGradient = (newGradient: string) => {
* Banners
------------------*/
const isSolanaStakingBanner = ref(false);
const isSurveyPopup = ref(false);

const bannersState = new BannersState();

const openSurveyPopup = async () => {
if (await bannersState.showSurveyPopup()) {
setTimeout(() => {
isSurveyPopup.value = true;
}, 4000);
}
};

const closeSurveyPopup = () => {
isSurveyPopup.value = false;
bannersState.hideSurveyPopup();
};

const closeSolanaStakingBanner = () => {
isSolanaStakingBanner.value = false;
bannersState.hideSolanaStakingBanner();
openSurveyPopup();
};
</script>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,13 @@
:loop="true"
class="swap-initiated__loading"
/>
<p v-if="isHardware">
<p v-if="isHardware && !waitingToBeMined">
Follow further instructions on your hardware wallet device
</p>
<p v-if="waitingToBeMined">
Waiting for Transactions to be mined, this can take upto 30
seconds
</p>
</div>

<div v-if="!isLoading && !isError">
Expand Down Expand Up @@ -91,6 +95,7 @@ interface IProps {
isLoading: boolean;
isHardware: boolean;
isError: boolean;
waitingToBeMined: boolean;
errorMessage: string;
network: BaseNetwork;
}
Expand Down
Loading
Loading