Merge branch 'main' into feat/safari-support

Author: kvhnuke

package.json

@@ -34,7 +34,7 @@
   "devDependencies": {
     "@commitlint/cli": "^19.8.0",
     "@commitlint/config-conventional": "^19.8.0",
-    "@swc/core": "^1.11.9",
+    "@swc/core": "^1.11.21",
     "concurrently": "^9.1.2",
     "husky": "^9.1.7",
     "node-notifier": "^10.0.1",

packages/extension-bridge/package.json

@@ -44,23 +44,23 @@
     "webextension-polyfill": "^0.12.0"
   },
   "devDependencies": {
-    "@types/node": "^22.13.10",
+    "@types/node": "^22.14.1",
     "@types/webextension-polyfill": "^0.12.3",
-    "@typescript-eslint/eslint-plugin": "^5.62.0",
-    "@typescript-eslint/parser": "^5.62.0",
+    "@typescript-eslint/eslint-plugin": "^8.30.1",
+    "@typescript-eslint/parser": "^8.30.1",
     "bumpp": "^10.1.0",
-    "eslint": "^9.22.0",
+    "eslint": "^9.24.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint-config-prettier": "^10.1.2",
     "eslint-import-resolver-alias": "^1.1.2",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-module-resolver": "^1.5.0",
     "prettier": "^3.5.3",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
     "tsup": "^8.4.0",
-    "type-fest": "^4.37.0",
-    "typescript": "^5.8.2",
-    "typescript-eslint": "8.26.1"
+    "type-fest": "^4.40.0",
+    "typescript": "^5.8.3",
+    "typescript-eslint": "8.30.1"
   }
 }

packages/extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enkryptcom/extension",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -24,7 +24,7 @@
     "watch:firefox": "yarn prebuild && cross-env BROWSER='firefox' vite"
   },
   "dependencies": {
-    "@amplitude/analytics-browser": "^2.11.13",
+    "@amplitude/analytics-browser": "^2.14.0",
     "@enkryptcom/extension-bridge": "workspace:^",
     "@enkryptcom/hw-wallets": "workspace:^",
     "@enkryptcom/keyring": "workspace:^",
@@ -41,25 +41,25 @@
     "@kadena/pactjs-cli": "^1.17.1",
     "@ledgerhq/hw-transport-webusb": "^6.29.4",
     "@metamask/eth-sig-util": "^8.2.0",
-    "@metaplex-foundation/mpl-bubblegum": "^4.3.1",
-    "@metaplex-foundation/umi": "^1.1.1",
-    "@metaplex-foundation/umi-bundle-defaults": "^1.1.1",
-    "@polkadot/api": "^15.8.1",
-    "@polkadot/extension-inject": "^0.58.5",
-    "@polkadot/keyring": "^13.4.3",
-    "@polkadot/rpc-provider": "^15.8.1",
-    "@polkadot/types": "^15.8.1",
-    "@polkadot/types-known": "^15.8.1",
-    "@polkadot/ui-shared": "^3.12.2",
-    "@polkadot/util": "^13.4.3",
+    "@metaplex-foundation/mpl-bubblegum": "^4.4.0",
+    "@metaplex-foundation/umi": "^1.2.0",
+    "@metaplex-foundation/umi-bundle-defaults": "^1.2.0",
+    "@polkadot/api": "^15.9.2",
+    "@polkadot/extension-inject": "^0.58.8",
+    "@polkadot/keyring": "^13.4.4",
+    "@polkadot/rpc-provider": "^15.9.2",
+    "@polkadot/types": "^15.9.2",
+    "@polkadot/types-known": "^15.9.2",
+    "@polkadot/ui-shared": "^3.13.1",
+    "@polkadot/util": "^13.4.4",
     "@polkadot/wasm-crypto": "^7.4.1",
-    "@solana-developers/helpers": "^2.8.0",
+    "@solana-developers/helpers": "2.8.0",
     "@solana/spl-token": "^0.4.13",
     "@solana/wallet-standard-features": "^1.3.0",
     "@solana/web3.js": "^1.98.0",
     "@wallet-standard/base": "^1.1.0",
     "add": "^2.0.6",
-    "bignumber.js": "^9.1.2",
+    "bignumber.js": "^9.2.1",
     "bip39": "^3.1.0",
     "bitcoinjs-lib": "^6.1.7",
     "bs58": "^6.0.0",
@@ -74,7 +74,7 @@
     "moment": "^2.30.1",
     "nanoevents": "^9.1.0",
     "pact-lang-api": "^4.3.6",
-    "pinia": "^2.3.1",
+    "pinia": "^3.0.2",
     "qrcode.vue": "^3.6.0",
     "switch-ts": "^1.1.1",
     "url-parse": "^1.5.10",
@@ -98,46 +98,46 @@
     "@rollup/plugin-replace": "^6.0.2",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^12.1.2",
-    "@tsconfig/node20": "^20.1.4",
-    "@types/bs58": "^4.0.4",
-    "@types/chrome": "^0.0.309",
+    "@tsconfig/node20": "^20.1.5",
+    "@types/bs58": "^5.0.0",
+    "@types/chrome": "^0.0.315",
     "@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.16",
-    "@types/node": "^22.13.10",
+    "@types/node": "^22.14.1",
     "@types/url-parse": "^1.4.11",
     "@types/utf-8-validate": "^5.0.2",
     "@types/uuid": "^10.0.0",
     "@types/wif": "^2.0.5",
     "@types/zxcvbn": "^4.4.5",
-    "@vitejs/plugin-vue": "^5.2.1",
+    "@vitejs/plugin-vue": "^5.2.3",
     "@vue/eslint-config-prettier": "^10.2.0",
     "@vue/eslint-config-typescript": "^14.5.0",
     "@vue/tsconfig": "^0.7.0",
-    "@vueuse/core": "^12.8.2",
+    "@vueuse/core": "^13.1.0",
     "cross-env": "^7.0.3",
-    "eslint": "^9.22.0",
-    "eslint-plugin-vue": "^9.33.0",
+    "eslint": "^9.24.0",
+    "eslint-plugin-vue": "^10.0.0",
     "fs-extra": "^11.3.0",
-    "jsdom": "^26.0.0",
-    "less": "^4.2.2",
+    "jsdom": "^26.1.0",
+    "less": "^4.3.0",
     "less-loader": "^12.2.0",
     "npm-run-all2": "^7.0.2",
     "prettier": "^3.5.3",
     "rimraf": "^6.0.1",
-    "rollup": "^4.35.0",
+    "rollup": "^4.40.0",
     "rollup-plugin-visualizer": "^5.14.0",
     "semver": "^7.7.1",
     "systeminformation": "^5.25.11",
     "tsup": "^8.4.0",
-    "typescript": "~5.8.2",
+    "typescript": "~5.8.3",
     "url": "^0.11.4",
-    "vite": "^6.2.1",
+    "vite": "^6.3.1",
     "vite-plugin-node-polyfills": "0.23.0",
     "vite-tsconfig-paths": "^5.1.4",
-    "vitest": "^3.0.8",
+    "vitest": "^3.1.1",
     "vue-tsc": "^2.2.8",
     "webextension-polyfill": "^0.12.0"
   },

packages/extension/src/libs/keyring/keyring.ts

@@ -6,6 +6,7 @@ import {
   HWWalletAdd,
   KeyPairAdd,
   KeyRecordAdd,
+  MnemonicWithExtraWord,
   SignerType,
   SignOptions,
   WalletType,
@@ -16,8 +17,15 @@ export class KeyRingBase {
     const browserStorage = new BrowserStorage(InternalStorageNamespace.keyring);
     this.#keyring = new KeyRing(browserStorage);
   }
-  init(mnemonic: string, password: string): Promise<void> {
-    return this.#keyring.init(password, { mnemonic });
+  init(options: {
+    mnemonic: string;
+    password: string;
+    extraWord?: string;
+  }): Promise<void> {
+    return this.#keyring.init(options.password, {
+      mnemonic: options.mnemonic,
+      extraWord: options.extraWord,
+    });
   }
   async reset(): Promise<void> {
     const resetPromises = Object.values(InternalStorageNamespace).map(name =>
@@ -77,7 +85,7 @@ export class KeyRingBase {
   lock(): void {
     return this.#keyring.lock();
   }
-  getMnemonic(password: string): Promise<string> {
+  getMnemonic(password: string): Promise<MnemonicWithExtraWord> {
     return this.#keyring.getMnemonic(password);
   }
   isInitialized(): Promise<boolean> {

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

@@ -0,0 +1,106 @@
+import { NFTCollection, NFTType } from '@/types/nft';
+import { NodeType } from '@/types/provider';
+import cacheFetch from '../cache-fetch';
+import { NetworkNames } from '@enkryptcom/types';
+import { GRNFTType, GRResponse } from './types/goldrush';
+import imgNotFound from '@action/assets/common/not-found.jpg';
+const GR_ENDPOINT = 'https://partners.mewapi.io/nftsv2/';
+const CACHE_TTL = 60 * 1000;
+const getExternalURL = (network: NodeType, contract: string, id: string) => {
+  if (network.name === NetworkNames.Gnosis)
+    return `https://niftyfair.io/gc/asset/${contract}/${id}/`;
+  if (network.name === NetworkNames.Matic)
+    return `https://rarible.com/token/polygon/${contract}:${id}`;
+  if (network.name === NetworkNames.Arbitrum)
+    return `https://rarible.com/token/arbitrum/${contract}:${id}`;
+  if (network.name === NetworkNames.Base)
+    return `https://rarible.com/token/base/${contract}:${id}`;
+  return '';
+};
+export default async (
+  network: NodeType,
+  address: string,
+): Promise<NFTCollection[]> => {
+  const supportedNetworks = {
+    [NetworkNames.Ethereum]: 'eth-mainnet',
+    [NetworkNames.Matic]: 'matic-mainnet',
+    [NetworkNames.Binance]: 'bsc-mainnet',
+    [NetworkNames.Arbitrum]: 'arbitrum-mainnet',
+    [NetworkNames.Optimism]: 'optimism-mainnet',
+    [NetworkNames.Base]: 'base-mainnet',
+    [NetworkNames.Linea]: 'linea-mainnet',
+    [NetworkNames.Avalanche]: 'avalanche-mainnet',
+    [NetworkNames.ZkSync]: 'zksync-mainnet',
+    [NetworkNames.Gnosis]: 'gnosis-mainnet',
+    [NetworkNames.Scroll]: 'scroll-mainnet',
+    [NetworkNames.Bera]: 'berachain-mainnet',
+    [NetworkNames.Unichain]: 'unichain-mainnet',
+  };
+  if (!Object.keys(supportedNetworks).includes(network.name))
+    throw new Error('Goldrush: network not supported');
+  let allItems: GRNFTType[] = [];
+  const fetchAll = (): Promise<void> => {
+    const query = `${GR_ENDPOINT}${
+      supportedNetworks[network.name as keyof typeof supportedNetworks]
+    }/address/${address}/balances_nft/?no-spam=true&with-uncached=true`;
+    return cacheFetch(
+      {
+        url: query,
+      },
+      CACHE_TTL,
+    ).then(json => {
+      const items: GRNFTType[] = (json as GRResponse).data.items;
+      allItems = allItems.concat(items);
+    });
+  };
+  await fetchAll();
+  if (!allItems || !allItems.length) return [];
+  const collections: Record<string, NFTCollection> = {};
+  allItems.forEach(item => {
+    if (
+      !item.supports_erc.includes('erc1155') &&
+      !item.supports_erc.includes('erc721')
+    )
+      return;
+    const firstNftWithInfo = item.nft_data.find(
+      nft =>
+        !!nft.external_data &&
+        !!nft.external_data.description &&
+        !!nft.external_data.image,
+    );
+    if (!firstNftWithInfo) return;
+
+    const ret: NFTCollection = {
+      name: item.contract_name,
+      description: firstNftWithInfo.external_data.description,
+      image:
+        firstNftWithInfo.external_data.image_512 ||
+        firstNftWithInfo.external_data.image_256 ||
+        firstNftWithInfo.external_data.image_1024 ||
+        firstNftWithInfo.external_data.image ||
+        imgNotFound,
+      contract: item.contract_address,
+      items: item.nft_data
+        .filter(nft => nft.external_data)
+        .map(nft => {
+          return {
+            contract: item.contract_address,
+            id: nft.token_id,
+            image:
+              nft.external_data.image_512 ||
+              nft.external_data.image_256 ||
+              nft.external_data.image_1024 ||
+              nft.external_data.image ||
+              imgNotFound,
+            name: nft.external_data.name,
+            url: getExternalURL(network, item.contract_address, nft.token_id),
+            type: item.supports_erc.includes('erc1155')
+              ? NFTType.ERC1155
+              : NFTType.ERC721,
+          };
+        }),
+    };
+    collections[item.contract_address] = ret;
+  });
+  return Object.values(collections);
+};