keynesol-shared 1.0.4 → 1.0.5

package/dist/components/Wallet/WalletProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WalletProvider.d.ts","sourceRoot":"","sources":["../../../src/components/Wallet/WalletProvider.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAW,SAAS,EAAE,MAAM,OAAO,CAAC;AASlD,UAAU,mBAAmB;IAC3B,QAAQ,EAAE,SAAS,CAAC;IACpB,OAAO,CAAC,EAAE,QAAQ,GAAG,cAAc,GAAG,SAAS,CAAC;IAChD,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,cAAc,GAAI,kEAI5B,mBAAmB,4CAoFrB,CAAC"}
+{"version":3,"file":"WalletProvider.d.ts","sourceRoot":"","sources":["../../../src/components/Wallet/WalletProvider.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAW,SAAS,EAAE,MAAM,OAAO,CAAC;AAUlD,UAAU,mBAAmB;IAC3B,QAAQ,EAAE,SAAS,CAAC;IACpB,OAAO,CAAC,EAAE,QAAQ,GAAG,cAAc,GAAG,SAAS,CAAC;IAChD,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,cAAc,GAAI,kEAI5B,mBAAmB,4CAoFrB,CAAC"}

package/dist/components/Wallet/WalletProvider.js

@@ -16,7 +16,8 @@ var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = require("react");
 var wallet_adapter_react_1 = require("@solana/wallet-adapter-react");
 var wallet_adapter_base_1 = require("@solana/wallet-adapter-base");
-var wallet_adapter_wallets_1 = require("@solana/wallet-adapter-wallets");
+var wallet_adapter_phantom_1 = require("@solana/wallet-adapter-phantom");
+var wallet_adapter_solflare_1 = require("@solana/wallet-adapter-solflare");
 var wallet_adapter_react_ui_1 = require("@solana/wallet-adapter-react-ui");
 var web3_js_1 = require("@solana/web3.js");
 require('@solana/wallet-adapter-react-ui/styles.css');
@@ -46,7 +47,7 @@ var WalletProvider = function (_a) {
         var walletAdapters = [];
         // Only add Phantom if it's not already registered as Standard Wallet
         try {
-            var phantom = new wallet_adapter_wallets_1.PhantomWalletAdapter();
+            var phantom = new wallet_adapter_phantom_1.PhantomWalletAdapter();
             walletAdapters.push(phantom);
         }
         catch (error) {
@@ -54,7 +55,7 @@ var WalletProvider = function (_a) {
         }
         // Add Solflare
         try {
-            var solflare = new wallet_adapter_wallets_1.SolflareWalletAdapter();
+            var solflare = new wallet_adapter_solflare_1.SolflareWalletAdapter();
             walletAdapters.push(solflare);
         }
         catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "keynesol-shared",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Shared code package for Keynesol Web3 Prediction Platform",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -26,9 +26,10 @@
     "@coral-xyz/anchor": "^0.31.1",
     "@solana/spl-token": "^0.3.9",
     "@solana/wallet-adapter-base": "^0.9.23",
+    "@solana/wallet-adapter-phantom": "^0.9.28",
     "@solana/wallet-adapter-react": "^0.15.35",
     "@solana/wallet-adapter-react-ui": "^0.9.35",
-    "@solana/wallet-adapter-wallets": "^0.19.32",
+    "@solana/wallet-adapter-solflare": "^0.6.32",
     "@solana/web3.js": "^1.87.6",
     "@supabase/supabase-js": "^2.90.1",
     "react-hot-toast": "^2.4.1"

package/src/components/Wallet/WalletProvider.tsx

@@ -1,104 +1,105 @@
-import React, { useMemo, ReactNode } from 'react';
-import { ConnectionProvider, WalletProvider as SolanaWalletProvider } from '@solana/wallet-adapter-react';
-import { WalletAdapterNetwork } from '@solana/wallet-adapter-base';
-import { PhantomWalletAdapter, SolflareWalletAdapter } from '@solana/wallet-adapter-wallets';
-import { WalletModalProvider } from '@solana/wallet-adapter-react-ui';
-import { clusterApiUrl } from '@solana/web3.js';
-
-require('@solana/wallet-adapter-react-ui/styles.css');
-
-interface WalletProviderProps {
-  children: ReactNode;
-  network?: 'devnet' | 'mainnet-beta' | 'testnet';
-  rpcEndpoint?: string;
-}
-
-export const WalletProvider = ({ 
-  children, 
-  network: networkProp,
-  rpcEndpoint: rpcEndpointProp 
-}: WalletProviderProps) => {
-  // Get network from prop, environment variable, or default to devnet
-  const networkEnv = networkProp || 
-    (typeof process !== 'undefined' && process.env?.NEXT_PUBLIC_SOLANA_NETWORK) || 
-    'devnet';
-  
-  const network = networkEnv === 'mainnet-beta' 
-    ? WalletAdapterNetwork.Mainnet 
-    : networkEnv === 'testnet'
-    ? WalletAdapterNetwork.Testnet
-    : WalletAdapterNetwork.Devnet;
-  
-  // Use custom RPC endpoint if provided, otherwise use cluster API URL
-  const endpoint = useMemo(() => {
-    const customEndpoint = rpcEndpointProp || 
-      (typeof process !== 'undefined' && process.env?.NEXT_PUBLIC_RPC_ENDPOINT);
-    if (customEndpoint) {
-      return customEndpoint;
-    }
-    return clusterApiUrl(network);
-  }, [network, rpcEndpointProp]);
-
-  const wallets = useMemo(
-    () => {
-      const walletAdapters = [];
-      
-      // Only add Phantom if it's not already registered as Standard Wallet
-      try {
-        const phantom = new PhantomWalletAdapter();
-        walletAdapters.push(phantom);
-      } catch (error) {
-        console.warn('Phantom wallet adapter already registered or error:', error);
-      }
-      
-      // Add Solflare
-      try {
-        const solflare = new SolflareWalletAdapter();
-        walletAdapters.push(solflare);
-      } catch (error) {
-        console.warn('Solflare wallet adapter error:', error);
-      }
-      
-      return walletAdapters;
-    },
-    []
-  );
-
-  // Disable WebSocket for custom RPC endpoints that may not support it
-  // Solana SDK will automatically fallback to HTTP polling
-  const connectionConfig = useMemo(() => {
-    const customEndpoint = rpcEndpointProp || 
-      (typeof process !== 'undefined' && process.env?.NEXT_PUBLIC_RPC_ENDPOINT);
-    
-    // If using custom endpoint (not public Solana RPC), disable WebSocket
-    const isCustomEndpoint = customEndpoint && 
-      !customEndpoint.includes('api.devnet.solana.com') && 
-      !customEndpoint.includes('api.mainnet-beta.solana.com') &&
-      !customEndpoint.includes('api.testnet.solana.com');
-    
-    return {
-      commitment: 'confirmed' as const,
-      // Disable WebSocket for custom endpoints to avoid connection errors
-      // SDK will automatically use HTTP polling instead
-      ...(isCustomEndpoint ? { 
-        wsEndpoint: undefined,
-        disableRetryOnRateLimit: false,
-      } : {}),
-    };
-  }, [rpcEndpointProp]);
-
-  // Type assertion to fix React 18/19 compatibility
-  const ConnectionProviderComponent = ConnectionProvider as any;
-  
-    // Type assertion to fix React 18/19 compatibility
-  
-  return (
-    <ConnectionProviderComponent endpoint={endpoint} config={connectionConfig}>
-      <SolanaWalletProvider wallets={wallets} autoConnect>
-        <WalletModalProvider>
-          {children}
-        </WalletModalProvider>
-      </SolanaWalletProvider>
-    </ConnectionProviderComponent>
-  );
+import React, { useMemo, ReactNode } from 'react';
+import { ConnectionProvider, WalletProvider as SolanaWalletProvider } from '@solana/wallet-adapter-react';
+import { WalletAdapterNetwork } from '@solana/wallet-adapter-base';
+import { PhantomWalletAdapter } from '@solana/wallet-adapter-phantom';
+import { SolflareWalletAdapter } from '@solana/wallet-adapter-solflare';
+import { WalletModalProvider } from '@solana/wallet-adapter-react-ui';
+import { clusterApiUrl } from '@solana/web3.js';
+
+require('@solana/wallet-adapter-react-ui/styles.css');
+
+interface WalletProviderProps {
+  children: ReactNode;
+  network?: 'devnet' | 'mainnet-beta' | 'testnet';
+  rpcEndpoint?: string;
+}
+
+export const WalletProvider = ({ 
+  children, 
+  network: networkProp,
+  rpcEndpoint: rpcEndpointProp 
+}: WalletProviderProps) => {
+  // Get network from prop, environment variable, or default to devnet
+  const networkEnv = networkProp || 
+    (typeof process !== 'undefined' && process.env?.NEXT_PUBLIC_SOLANA_NETWORK) || 
+    'devnet';
+  
+  const network = networkEnv === 'mainnet-beta' 
+    ? WalletAdapterNetwork.Mainnet 
+    : networkEnv === 'testnet'
+    ? WalletAdapterNetwork.Testnet
+    : WalletAdapterNetwork.Devnet;
+  
+  // Use custom RPC endpoint if provided, otherwise use cluster API URL
+  const endpoint = useMemo(() => {
+    const customEndpoint = rpcEndpointProp || 
+      (typeof process !== 'undefined' && process.env?.NEXT_PUBLIC_RPC_ENDPOINT);
+    if (customEndpoint) {
+      return customEndpoint;
+    }
+    return clusterApiUrl(network);
+  }, [network, rpcEndpointProp]);
+
+  const wallets = useMemo(
+    () => {
+      const walletAdapters = [];
+      
+      // Only add Phantom if it's not already registered as Standard Wallet
+      try {
+        const phantom = new PhantomWalletAdapter();
+        walletAdapters.push(phantom);
+      } catch (error) {
+        console.warn('Phantom wallet adapter already registered or error:', error);
+      }
+      
+      // Add Solflare
+      try {
+        const solflare = new SolflareWalletAdapter();
+        walletAdapters.push(solflare);
+      } catch (error) {
+        console.warn('Solflare wallet adapter error:', error);
+      }
+      
+      return walletAdapters;
+    },
+    []
+  );
+
+  // Disable WebSocket for custom RPC endpoints that may not support it
+  // Solana SDK will automatically fallback to HTTP polling
+  const connectionConfig = useMemo(() => {
+    const customEndpoint = rpcEndpointProp || 
+      (typeof process !== 'undefined' && process.env?.NEXT_PUBLIC_RPC_ENDPOINT);
+    
+    // If using custom endpoint (not public Solana RPC), disable WebSocket
+    const isCustomEndpoint = customEndpoint && 
+      !customEndpoint.includes('api.devnet.solana.com') && 
+      !customEndpoint.includes('api.mainnet-beta.solana.com') &&
+      !customEndpoint.includes('api.testnet.solana.com');
+    
+    return {
+      commitment: 'confirmed' as const,
+      // Disable WebSocket for custom endpoints to avoid connection errors
+      // SDK will automatically use HTTP polling instead
+      ...(isCustomEndpoint ? { 
+        wsEndpoint: undefined,
+        disableRetryOnRateLimit: false,
+      } : {}),
+    };
+  }, [rpcEndpointProp]);
+
+  // Type assertion to fix React 18/19 compatibility
+  const ConnectionProviderComponent = ConnectionProvider as any;
+  
+    // Type assertion to fix React 18/19 compatibility
+  
+  return (
+    <ConnectionProviderComponent endpoint={endpoint} config={connectionConfig}>
+      <SolanaWalletProvider wallets={wallets} autoConnect>
+        <WalletModalProvider>
+          {children}
+        </WalletModalProvider>
+      </SolanaWalletProvider>
+    </ConnectionProviderComponent>
+  );
 };

package/src/hooks/useProgram.ts

@@ -1,93 +1,93 @@
-import { useMemo, useState, useEffect } from 'react';
-import { useConnection, useWallet } from '@solana/wallet-adapter-react';
-import { Program, AnchorProvider, Idl } from '@coral-xyz/anchor';
-import { PublicKey } from '@solana/web3.js';
-
-// Program ID from environment or default
-const getProgramId = (): PublicKey => {
-  const PROGRAM_ID_STRING = typeof process !== 'undefined' && process.env?.NEXT_PUBLIC_PROGRAM_ID 
-    ? process.env.NEXT_PUBLIC_PROGRAM_ID 
-    : 'Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS';
-  
-  try {
-    return new PublicKey(PROGRAM_ID_STRING);
-  } catch (error) {
-    console.error('Invalid Program ID:', PROGRAM_ID_STRING, error);
-    // Fallback to default
-    return new PublicKey('Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS');
-  }
-};
-
-const PROGRAM_ID = getProgramId();
-
-export interface UseProgramOptions {
-  idlPath?: string; // Path to IDL file, default: '/web3_prediction_platform.json'
-  programId?: PublicKey; // Override program ID
-}
-
-export const useProgram = (options: UseProgramOptions = {}) => {
-  const { connection } = useConnection();
-  const wallet = useWallet();
-  const [idl, setIdl] = useState<Idl | null>(null);
-  const [idlError, setIdlError] = useState<string | null>(null);
-
-  const idlPath = options.idlPath || '/web3_prediction_platform.json';
-  const programId = options.programId || PROGRAM_ID;
-
-  // Load IDL from public folder (works with static export)
-  useEffect(() => {
-    const loadIdl = async () => {
-      try {
-        const response = await fetch(idlPath);
-        if (!response.ok) {
-          throw new Error(`Failed to load IDL: ${response.statusText}`);
-        }
-        const idlData = await response.json();
-        setIdl(idlData as Idl);
-        setIdlError(null);
-      } catch (error: any) {
-        console.error('Error loading IDL:', error);
-        setIdlError(error.message || 'Failed to load IDL');
-        setIdl(null);
-      }
-    };
-
-    loadIdl();
-  }, [idlPath]);
-
-  const provider = useMemo(() => {
-    if (!wallet.publicKey || !connection) return null;
-    
-    try {
-      return new AnchorProvider(
-        connection,
-        wallet as any,
-        { commitment: 'confirmed' }
-      );
-    } catch (error) {
-      console.error('Error creating provider:', error);
-      return null;
-    }
-  }, [connection, wallet]);
-
-  const program = useMemo(() => {
-    if (!provider || !idl) return null;
-    
-    try {
-      // Anchor Program constructor: new Program(idl, programId, provider)
-      // @ts-ignore - TypeScript inference issue with Program constructor argument types
-      return new Program(idl as any, programId, provider as AnchorProvider) as any;
-    } catch (error) {
-      console.error('Error creating program:', error);
-      return null;
-    }
-  }, [provider, idl, programId]);
-
-  return { 
-    program, 
-    provider,
-    idl,
-    idlError,
-    programId
-  };
+import { useMemo, useState, useEffect } from 'react';
+import { useConnection, useWallet } from '@solana/wallet-adapter-react';
+import { Program, AnchorProvider, Idl } from '@coral-xyz/anchor';
+import { PublicKey } from '@solana/web3.js';
+
+// Program ID from environment or default
+const getProgramId = (): PublicKey => {
+  const PROGRAM_ID_STRING = typeof process !== 'undefined' && process.env?.NEXT_PUBLIC_PROGRAM_ID 
+    ? process.env.NEXT_PUBLIC_PROGRAM_ID 
+    : 'Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS';
+  
+  try {
+    return new PublicKey(PROGRAM_ID_STRING);
+  } catch (error) {
+    console.error('Invalid Program ID:', PROGRAM_ID_STRING, error);
+    // Fallback to default
+    return new PublicKey('Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS');
+  }
+};
+
+const PROGRAM_ID = getProgramId();
+
+export interface UseProgramOptions {
+  idlPath?: string; // Path to IDL file, default: '/web3_prediction_platform.json'
+  programId?: PublicKey; // Override program ID
+}
+
+export const useProgram = (options: UseProgramOptions = {}) => {
+  const { connection } = useConnection();
+  const wallet = useWallet();
+  const [idl, setIdl] = useState<Idl | null>(null);
+  const [idlError, setIdlError] = useState<string | null>(null);
+
+  const idlPath = options.idlPath || '/web3_prediction_platform.json';
+  const programId = options.programId || PROGRAM_ID;
+
+  // Load IDL from public folder (works with static export)
+  useEffect(() => {
+    const loadIdl = async () => {
+      try {
+        const response = await fetch(idlPath);
+        if (!response.ok) {
+          throw new Error(`Failed to load IDL: ${response.statusText}`);
+        }
+        const idlData = await response.json();
+        setIdl(idlData as Idl);
+        setIdlError(null);
+      } catch (error: any) {
+        console.error('Error loading IDL:', error);
+        setIdlError(error.message || 'Failed to load IDL');
+        setIdl(null);
+      }
+    };
+
+    loadIdl();
+  }, [idlPath]);
+
+  const provider = useMemo(() => {
+    if (!wallet.publicKey || !connection) return null;
+    
+    try {
+      return new AnchorProvider(
+        connection,
+        wallet as any,
+        { commitment: 'confirmed' }
+      );
+    } catch (error) {
+      console.error('Error creating provider:', error);
+      return null;
+    }
+  }, [connection, wallet]);
+
+  const program = useMemo(() => {
+    if (!provider || !idl) return null;
+    
+    try {
+      // Anchor Program constructor: new Program(idl, programId, provider)
+      // @ts-ignore - TypeScript inference issue with Program constructor argument types
+      return new Program(idl as any, programId, provider as AnchorProvider) as any;
+    } catch (error) {
+      console.error('Error creating program:', error);
+      return null;
+    }
+  }, [provider, idl, programId]);
+
+  return { 
+    program, 
+    provider,
+    idl,
+    idlError,
+    programId
+  };
 };