Merge pull request #2494 from pyth-network/cprussin/fix-proposals-wallet

fix: fix broken wallet adapter in proposals app

Author: cprussin

governance/xc_admin/packages/xc_admin_frontend/package.json

@@ -25,10 +25,10 @@
     "@radix-ui/react-label": "^2.0.0",
     "@radix-ui/react-tooltip": "^1.0.3",
     "@solana/spl-token": "^0.3.7",
-    "@solana/wallet-adapter-base": "^0.9.20",
-    "@solana/wallet-adapter-react": "^0.15.28",
-    "@solana/wallet-adapter-react-ui": "^0.9.27",
-    "@solana/wallet-adapter-wallets": "0.19.10",
+    "@solana/wallet-adapter-base": "catalog:",
+    "@solana/wallet-adapter-react": "catalog:",
+    "@solana/wallet-adapter-react-ui": "catalog:",
+    "@solana/wallet-adapter-wallets": "catalog:",
     "@solana/web3.js": "^1.73.0",
     "@sqds/mesh": "^1.0.6",
     "@tanstack/react-table": "^8.7.6",

governance/xc_admin/packages/xc_admin_frontend/pages/_app.tsx

@@ -6,12 +6,9 @@ import {
 import { WalletModalProvider } from '@solana/wallet-adapter-react-ui'
 import '@solana/wallet-adapter-react-ui/styles.css'
 import {
-  GlowWalletAdapter,
   LedgerWalletAdapter,
   PhantomWalletAdapter,
   SolflareWalletAdapter,
-  SolletExtensionWalletAdapter,
-  SolletWalletAdapter,
   TorusWalletAdapter,
   WalletConnectWalletAdapter,
   WalletConnectWalletAdapterConfig,
@@ -55,12 +52,9 @@ function MyApp({ Component, pageProps }: AppProps) {
   const wallets = useMemo(
     () => [
       new PhantomWalletAdapter(),
-      new GlowWalletAdapter(),
       new SolflareWalletAdapter(),
       new TorusWalletAdapter(),
       new LedgerWalletAdapter(),
-      new SolletWalletAdapter(),
-      new SolletExtensionWalletAdapter(),
       new WalletConnectWalletAdapter(walletConnectConfig),
     ],
     []

package.json

@@ -24,6 +24,9 @@
   "pnpm": {
     "overrides": {
       "@solana/web3.js@1.77.4>rpc-websockets": "7.11.0"
+    },
+    "patchedDependencies": {
+      "eccrypto@1.1.6": "patches/eccrypto@1.1.6.patch"
     }
   }
 }

patches/eccrypto@1.1.6.patch

@@ -0,0 +1,12 @@
+diff --git a/index.js b/index.js
+index a63218b73bb5cb1d566962fac9360689341fcae0..5f05762ce04ab0934973b02f04777a3bfa75d88f 100644
+--- a/index.js
++++ b/index.js
+@@ -21,6 +21,6 @@ try {
+     throw e;
+   } else {
+     console.info('secp256k1 unavailable, reverting to browser version');
+-    return (module.exports = require("./browser"));
++    module.exports = require("./browser");
+   }
+ }