feat: add solana to defaultConnectors (#159)

FuelLabs · Jul 16, 2024 · c9a306d · c9a306d
1 parent 23afa71
commit c9a306d
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 23 deletions.
diff --git a/.changeset/famous-items-shop.md b/.changeset/famous-items-shop.md
@@ -0,0 +1,5 @@
+---
+"@fuels/connectors": patch
+---
+
+Accept `ethWagmiConfig` for eth wallet wagmi configs
diff --git a/.changeset/hungry-students-cheer.md b/.changeset/hungry-students-cheer.md
@@ -0,0 +1,5 @@
+---
+"@fuel-connectors/solana-connector": patch
+---
+
+Include more solana wallets
diff --git a/examples/react-app/src/main.tsx b/examples/react-app/src/main.tsx
@@ -8,15 +8,7 @@ import { coinbaseWallet, walletConnect } from '@wagmi/connectors';
 import { http, createConfig, injected } from '@wagmi/core';
 import { mainnet, sepolia } from '@wagmi/core/chains';
 
-import {
-  BakoSafeConnector,
-  BurnerWalletConnector,
-  FuelWalletConnector,
-  FuelWalletDevelopmentConnector,
-  FueletWalletConnector,
-  SolanaConnector,
-  WalletConnectConnector,
-} from '@fuels/connectors';
+import { defaultConnectors } from '@fuels/connectors';
 import { FuelProvider } from '@fuels/react';
 
 import * as Toast from '@radix-ui/react-toast';
@@ -66,20 +58,11 @@ ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
       <FuelProvider
         theme="dark"
         fuelConfig={{
-          connectors: [
-            new FuelWalletConnector(),
-            new BakoSafeConnector(),
-            new FueletWalletConnector(),
-            new WalletConnectConnector({
-              wagmiConfig,
-              projectId: WC_PROJECT_ID,
-            }),
-            new FuelWalletDevelopmentConnector(),
-            new BurnerWalletConnector(),
-            new SolanaConnector({
-              projectId: WC_PROJECT_ID,
-            }),
-          ],
+          connectors: defaultConnectors({
+            devMode: true,
+            wcProjectId: WC_PROJECT_ID,
+            ethWagmiConfig: wagmiConfig,
+          }),
         }}
       >
         <Toast.Provider>

diff --git a/packages/connectors/src/defaultConnectors.ts b/packages/connectors/src/defaultConnectors.ts
@@ -3,7 +3,9 @@ import { BurnerWalletConnector } from '@fuel-connectors/burner-wallet-connector'
 import { FuelWalletDevelopmentConnector } from '@fuel-connectors/fuel-development-wallet';
 import { FuelWalletConnector } from '@fuel-connectors/fuel-wallet';
 import { FueletWalletConnector } from '@fuel-connectors/fuelet-wallet';
+import { SolanaConnector } from '@fuel-connectors/solana-connector';
 import { WalletConnectConnector } from '@fuel-connectors/walletconnect-connector';
+import type { Config } from '@wagmi/core';
 import type { FuelConnector } from 'fuels';
 import type { BurnerWalletConfig } from '../../burner-wallet-connector/src/types';
 
@@ -13,19 +15,25 @@ type DefaultConnectors = {
   devMode?: boolean;
   wcProjectId?: string;
   burnerWalletConfig?: BurnerWalletConfig;
+  ethWagmiConfig?: Config;
 };
 
 export function defaultConnectors({
   devMode,
   wcProjectId = DEFAULT_WC_PROJECT_ID,
   burnerWalletConfig,
+  ethWagmiConfig,
 }: DefaultConnectors = {}): Array<FuelConnector> {
   const connectors = [
     new FuelWalletConnector(),
     new BakoSafeConnector(),
     new FueletWalletConnector(),
     new WalletConnectConnector({
       projectId: wcProjectId,
+      wagmiConfig: ethWagmiConfig,
+    }),
+    new SolanaConnector({
+      projectId: wcProjectId,
     }),
     new BurnerWalletConnector(burnerWalletConfig),
   ];

diff --git a/packages/solana-connector/src/utils/solanaProvider.ts b/packages/solana-connector/src/utils/solanaProvider.ts
@@ -22,6 +22,7 @@ export function createSolanaProvider(config: SolanaConfig): ModalConfig {
   const solanaConfig =
     config.solanaConfig ??
     defaultSolanaConfig({
+      enableInjected: true,
       chains,
       projectId: config.projectId ?? DEFAULT_PROJECT_ID,
       metadata: {