devop: merge

package.json

@@ -41,6 +41,7 @@
   },
   "resolutions": {
     "@ledgerhq/compressjs": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.2.1.tgz",
-    "@noble/hashes": "^1.4.0"
+    "@noble/hashes": "^1.4.0",
+    "fork-ts-checker-webpack-plugin": "^6.5.3"
   }
 }

packages/extension/configs/rollup.config.base.mjs

@@ -4,6 +4,7 @@ import nodeResolve from "@rollup/plugin-node-resolve";
 import { uglify } from "rollup-plugin-uglify";
 import inject from "@rollup/plugin-inject";
 import replace from "@rollup/plugin-replace";
+import json from "@rollup/plugin-json";
 import packageJson from "../package.json" assert { type: "json" };
 
 /** @typedef {import('rollup').InputOptions} InputOptions */
@@ -27,8 +28,11 @@ const base = {
       __VERSION__: JSON.stringify(packageJson.version),
       __IS_OPERA__: process.env.BROWSER === "opera-edge",
     }),
-    typescript(),
+    typescript({
+      exclude: [/node_modules/],
+    }),
     commonjs(),
+    json(),
     inject({
       Buffer: ["buffer", "Buffer"],
     }),

packages/extension/package.json

@@ -37,17 +37,26 @@
     "@kadena/client": "^1.13.0",
     "@ledgerhq/hw-transport-webusb": "^6.29.2",
     "@metamask/eth-sig-util": "^7.0.3",
+    "@metaplex-foundation/mpl-bubblegum": "^4.2.0",
+    "@metaplex-foundation/umi": "^0.9.2",
+    "@metaplex-foundation/umi-bundle-defaults": "^0.9.2",
     "@rollup/plugin-replace": "^5.0.7",
+    "@solana-developers/helpers": "^2.4.0",
+    "@solana/spl-token": "^0.4.8",
+    "@solana/wallet-standard-features": "^1.2.0",
+    "@solana/web3.js": "^1.95.2",
     "@types/chrome": "^0.0.269",
     "@types/events": "^3.0.3",
     "@types/less": "^3.0.6",
     "@types/lodash": "^4.17.7",
     "@types/utf-8-validate": "^5.0.2",
     "@vueuse/core": "^10.11.0",
+    "@wallet-standard/base": "^0.0.0-20240703212708",
     "add": "^2.0.6",
     "bignumber.js": "^9.1.2",
     "bip39": "^3.1.0",
     "bitcoinjs-lib": "^6.1.6",
+    "bs58": "^6.0.0",
     "chai": "^4.5.0",
     "concurrently": "^8.2.2",
     "core-js": "^3.38.0",
@@ -90,8 +99,10 @@
     "@polkadot/wasm-crypto": "^7.3.2",
     "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-inject": "^5.0.5",
+    "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-typescript": "^11.1.6",
+    "@types/bs58": "^4.0.4",
     "@types/ethereumjs-abi": "^0.6.5",
     "@types/mocha": "^10.0.7",
     "@types/url-parse": "^1.4.11",
@@ -127,7 +138,7 @@
     "systeminformation": "^5.23.3",
     "ts-mocha": "^10.0.0",
     "tsconfig-paths": "^4.2.0",
-    "typescript": "^4.9.5",
+    "typescript": "^5.5.4",
     "url": "^0.11.4",
     "webextension-polyfill": "^0.12.0"
   },

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

@@ -3,13 +3,12 @@ import {
   InternalOnMessageResponse,
   Message,
 } from "@/types/messenger";
-import { RPCRequestType } from "@enkryptcom/types";
+import { RPCRequestType, OnMessageResponse } from "@enkryptcom/types";
 import { v4 as randomUUID } from "uuid";
 import { getCustomError } from "../error";
 import KeyRingBase from "../keyring/keyring";
 import { sendToWindow } from "@/libs/messenger/extension";
 import { ProviderName } from "@/types/provider";
-import { OnMessageResponse } from "@enkryptcom/types";
 import Providers from "@/providers";
 import Browser from "webextension-polyfill";
 import TabInfo from "@/libs/utils/tab-info";
@@ -48,6 +47,7 @@ class BackgroundHandler {
       [ProviderName.polkadot]: {},
       [ProviderName.bitcoin]: {},
       [ProviderName.kadena]: {},
+      [ProviderName.solana]: {},
     };
     this.#providers = Providers;
   }

packages/extension/src/libs/background/internal/unlock.ts

@@ -16,9 +16,9 @@ const unlock = (
   const initNewAccounts = (message.params[1] as boolean) ?? false;
   return keyring
     .unlock(password)
-    .then(() => {
+    .then(async () => {
       if (initNewAccounts) {
-        initAccounts(keyring);
+        await initAccounts(keyring);
       }
       return {
         result: JSON.stringify(true),

packages/extension/src/libs/background/types.ts

@@ -2,19 +2,25 @@ import BitcoinProvider from "@/providers/bitcoin";
 import type EthereumProvider from "@/providers/ethereum";
 import type PolkadotProvider from "@/providers/polkadot";
 import type KadenaProvider from "@/providers/kadena";
+import SolanaProvider from "@/providers/solana";
 
 export interface TabProviderType {
   [key: string]: Record<
     number,
-    EthereumProvider | PolkadotProvider | BitcoinProvider | KadenaProvider
+    | EthereumProvider
+    | PolkadotProvider
+    | BitcoinProvider
+    | KadenaProvider
+    | SolanaProvider
   >;
 }
 export interface ProviderType {
   [key: string]:
     | typeof EthereumProvider
     | typeof PolkadotProvider
     | typeof BitcoinProvider
-    | typeof KadenaProvider;
+    | typeof KadenaProvider
+    | typeof SolanaProvider;
 }
 export interface ExternalMessageOptions {
   savePersistentEvents: boolean;

packages/extension/src/libs/cache-fetch/index.ts

@@ -40,15 +40,16 @@ const cacheFetch = async (
     return fetch(options.url, fetchOptions)
       .then((res) => res.json())
       .then((json) => {
-        const jsonstring = JSON.stringify(json);
+        const jsondata = options.postProcess ? options.postProcess(json) : json;
+        const jsonstring = JSON.stringify(jsondata);
         if (!jsonstring.includes("error")) {
           const store: StoredData = {
             timestamp: new Date().getTime(),
             data: jsonstring,
           };
-          return storage.set(hash, store).then(() => json);
+          return storage.set(hash, store).then(() => jsondata);
         }
-        return json;
+        return jsondata;
       });
   }
 };

packages/extension/src/libs/cache-fetch/types.ts

@@ -2,6 +2,7 @@ export interface RequestOptions {
   url: string;
   post?: Record<string, any>;
   headers?: Record<string, any>;
+  postProcess?: (data: any) => any;
 }
 export interface StoredData {
   timestamp: number;

packages/extension/src/libs/dapp-list/index.ts

@@ -79,6 +79,22 @@ const lists: Partial<Record<NetworkNames, string>> = {
     "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/godwoken.json",
   [NetworkNames.ImmutableZkevm]:
     "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/imx.json",
+  [NetworkNames.ZChains]:
+    "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/zchains.json",
+  [NetworkNames.MantaPacific]:
+    "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/manta.json",
+  [NetworkNames.Mode]:
+    "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/mode.json",
+  [NetworkNames.OpBNB]:
+    "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/opBNB.json",
+  [NetworkNames.Palm]:
+    "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/palm.json",
+  [NetworkNames.ProofOfPlayApex]:
+    "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/popApex.json",
+  [NetworkNames.Scroll]:
+    "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/scroll.json",
+  [NetworkNames.Rari]:
+    "https://raw.githubusercontent.com/enkryptcom/dynamic-data/main/dapps/rari.json",
 };
 
 export default lists;

packages/extension/src/libs/market-data/index.ts

@@ -33,7 +33,7 @@ class MarketData {
     const fiat = await this.getFiatValue(fiatSymbol);
     if (market && fiat) {
       return balanceBN
-        .multipliedBy(market.current_price)
+        .multipliedBy(market.current_price ?? 0)
         .multipliedBy(fiat.exchange_rate)
         .toFixed(2);
     }

packages/extension/src/libs/market-data/types.ts

@@ -25,7 +25,7 @@ export interface CoinGeckoTokenMarket {
   symbol: string;
   name: string;
   image: string;
-  current_price: number;
+  current_price: null | number;
   market_cap: number;
   market_cap_rank: number;
   high_24h: number;

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

@@ -0,0 +1,95 @@
+import { NFTCollection, NFTItem, NFTType } from "@/types/nft";
+import { NodeType } from "@/types/provider";
+import cacheFetch from "../cache-fetch";
+import { NetworkNames } from "@enkryptcom/types";
+import { SHNFTType, SHResponse, SHSolanaNFTType } from "./types/simplehash";
+const SH_ENDPOINT = "https://partners.mewapi.io/nfts/";
+const CACHE_TTL = 60 * 1000;
+const SolanaTokenPrograms = {
+  Bubblegum: "BGUMAp9Gq7iTEuizy4pqaxsTyUCBK68MDfK752saRPUY",
+  Token: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
+};
+export default async (
+  network: NodeType,
+  address: string
+): Promise<NFTCollection[]> => {
+  const supportedNetworks = {
+    [NetworkNames.Solana]: "solana",
+  };
+  if (!Object.keys(supportedNetworks).includes(network.name))
+    throw new Error("Simplehash: network not supported");
+  let allItems: SHSolanaNFTType[] = [];
+  const fetchAll = (continuation?: string): Promise<void> => {
+    const query = continuation
+      ? continuation
+      : `${SH_ENDPOINT}owners_v2?chains=${
+          supportedNetworks[network.name as keyof typeof supportedNetworks]
+        }&wallet_addresses=${network.displayAddress(
+          address
+        )}&filters=spam_score__lte=50`;
+    return cacheFetch(
+      {
+        url: query,
+      },
+      CACHE_TTL
+    ).then((json) => {
+      const items: SHNFTType[] = (json.result as SHResponse).nfts;
+      allItems = allItems.concat(items as SHSolanaNFTType[]);
+      if (json.result.next) return fetchAll(json.result.next);
+    });
+  };
+  await fetchAll();
+  if (!allItems || !allItems.length) return [];
+  const collections: Record<string, NFTCollection> = {};
+  allItems.forEach((item) => {
+    if (!item.image_url && !item.previews.image_medium_url) return;
+    if (
+      item.extra_metadata.token_program !== SolanaTokenPrograms.Bubblegum &&
+      item.extra_metadata.token_program !== SolanaTokenPrograms.Token
+    )
+      return;
+    if (collections[item.collection.collection_id]) {
+      const tItem: NFTItem = {
+        contract: item.contract_address,
+        id: item.nft_id,
+        image: item.image_url || item.previews.image_medium_url,
+        name: item.name,
+        url: item.collection.marketplace_pages.length
+          ? item.collection.marketplace_pages[0].nft_url
+          : `https://magiceden.io/item-details/${item.contract_address}`,
+        type:
+          item.extra_metadata.token_program === SolanaTokenPrograms.Bubblegum
+            ? NFTType.SolanaBGUM
+            : NFTType.SolanaToken,
+      };
+      collections[item.collection.collection_id].items.push(tItem);
+    } else {
+      const ret: NFTCollection = {
+        name: item.collection.name,
+        description: item.collection.description,
+        image:
+          item.collection.image_url ||
+          require("@action/assets/common/not-found.jpg"),
+        contract: item.contract_address,
+        items: [
+          {
+            contract: item.contract_address,
+            id: item.nft_id,
+            image: item.image_url || item.previews.image_medium_url,
+            name: item.name,
+            url: item.collection.marketplace_pages.length
+              ? item.collection.marketplace_pages[0].nft_url
+              : `https://magiceden.io/item-details/${item.contract_address}`,
+            type:
+              item.extra_metadata.token_program ===
+              SolanaTokenPrograms.Bubblegum
+                ? NFTType.SolanaBGUM
+                : NFTType.SolanaToken,
+          },
+        ],
+      };
+      collections[item.collection.collection_id] = ret;
+    }
+  });
+  return Object.values(collections);
+};

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

@@ -23,6 +23,12 @@ export interface SHNFTType {
     external_url: string;
     collection_id: string;
     spam_score: number;
+    marketplace_pages: {
+      marketplace_id: string;
+      marketplace_name: string;
+      collection_url: string;
+      nft_url: string;
+    }[];
   };
   contract: {
     name: string;
@@ -37,6 +43,13 @@ export interface SHOrdinalsNFTType extends SHNFTType {
     };
   };
 }
+
+export interface SHSolanaNFTType extends SHNFTType {
+  extra_metadata: {
+    token_program: string;
+  };
+}
+
 export interface SHResponse {
   next: string;
   previous: string;

packages/extension/src/libs/utils/accounts.ts

@@ -1,6 +1,7 @@
 import { EnkryptAccount, NetworkNames, SignerType } from "@enkryptcom/types";
 import PublicKeyRing from "../keyring/public-keyring";
 import { getNetworkByName } from "./networks";
+import { ProviderName } from "@/types/provider";
 
 const getOtherSigners = (signers: SignerType[]): SignerType[] => {
   const otherSigners: SignerType[] = [];
@@ -22,16 +23,13 @@ export const getAccountsByNetworkName = async (
   const accounts = await keyring.getAccounts(network.signer);
 
   const filtered = accounts.filter((account) => {
-    if (account.isHardware && account.HWOptions !== undefined) {
-      // Polkadot and Kusama ledger apps only work for those networks
-      if (
-        account.HWOptions.networkName === NetworkNames.Kusama ||
-        account.HWOptions.networkName === NetworkNames.Polkadot
-      ) {
-        return account.HWOptions.networkName === networkName;
-      }
+    if (
+      account.isHardware &&
+      account.HWOptions !== undefined &&
+      network.provider !== ProviderName.ethereum
+    ) {
+      return account.HWOptions.networkName === networkName;
     }
-
     return true;
   });
   return filtered.map((f) => {

packages/extension/src/libs/utils/initialize-wallet.ts

@@ -3,13 +3,15 @@ import EthereumNetworks from "@/providers/ethereum/networks";
 import PolkadotNetworks from "@/providers/polkadot/networks";
 import BitcoinNetworks from "@/providers/bitcoin/networks";
 import KadenaNetworks from "@/providers/kadena/networks";
+import SolanaNetworks from "@/providers/solana/networks";
 import { NetworkNames, WalletType } from "@enkryptcom/types";
 import { getAccountsByNetworkName } from "@/libs/utils/accounts";
 export const initAccounts = async (keyring: KeyRing) => {
   const secp256k1btc = await getAccountsByNetworkName(NetworkNames.Bitcoin);
   const secp256k1 = await getAccountsByNetworkName(NetworkNames.Ethereum);
   const sr25519 = await getAccountsByNetworkName(NetworkNames.Polkadot);
   const ed25519kda = await getAccountsByNetworkName(NetworkNames.Kadena);
+  const ed25519sol = await getAccountsByNetworkName(NetworkNames.Solana);
   if (secp256k1.length == 0)
     await keyring.saveNewAccount({
       basePath: EthereumNetworks.ethereum.basePath,
@@ -38,6 +40,13 @@ export const initAccounts = async (keyring: KeyRing) => {
       signerType: KadenaNetworks.kadena.signer[0],
       walletType: WalletType.mnemonic,
     });
+  if (ed25519sol.length == 0)
+    await keyring.saveNewAccount({
+      basePath: SolanaNetworks.solana.basePath,
+      name: "Solana Account 1",
+      signerType: SolanaNetworks.solana.signer[0],
+      walletType: WalletType.mnemonic,
+    });
 };
 export const onboardInitializeWallets = async (
   mnemonic: string,