Merge pull request #155 from argentlabs/fix/connector-interface

fix: update connector interface for starknet-react compatibility
argentlabs · Nov 14, 2024 · 292b478 · 292b478
2 parents 67906c4 + 0a24fbc
commit 292b478
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 23 deletions.
diff --git a/src/connectors/argentMobile/index.ts b/src/connectors/argentMobile/index.ts
@@ -23,6 +23,7 @@ import { removeStarknetLastConnectedWallet } from "../../helpers/lastConnected"
 import { getRandomPublicRPCNode } from "../../helpers/publicRcpNodes"
 import { resetWalletConnect } from "../../helpers/resetWalletConnect"
 import {
+  ConnectArgs,
   Connector,
   type ConnectorData,
   type ConnectorIcons,
@@ -93,7 +94,7 @@ export class ArgentMobileBaseConnector extends Connector {
     return this._wallet
   }
 
-  async connect(): Promise<ConnectorData> {
+  async connect(_args: ConnectArgs = {}): Promise<ConnectorData> {
     await this.ensureWallet()
 
     if (!this._wallet) {
@@ -102,7 +103,6 @@ export class ArgentMobileBaseConnector extends Connector {
 
     const accounts = await this._wallet.request({
       type: "wallet_requestAccounts",
-      params: { silent_mode: false }, // explicit to show the modal
     })
 
     const chainId = await this.chainId()

diff --git a/src/connectors/braavosMobile/index.ts b/src/connectors/braavosMobile/index.ts
@@ -7,6 +7,7 @@ import {
 } from "@starknet-io/types-js"
 import { AccountInterface, ProviderInterface, ProviderOptions } from "starknet"
 import {
+  ConnectArgs,
   Connector,
   type ConnectorData,
   type ConnectorIcons,
@@ -51,7 +52,7 @@ export class BraavosMobileBaseConnector extends Connector {
     throw new Error("not implemented")
   }
 
-  async connect(): Promise<ConnectorData> {
+  async connect(_args: ConnectArgs = {}): Promise<ConnectorData> {
     await this.ensureWallet()
 
     // will return empty data, connect will only open braavos mobile app

diff --git a/src/connectors/connector.ts b/src/connectors/connector.ts
@@ -28,8 +28,8 @@ export interface ConnectorEvents {
   disconnect(): void
 }
 
-export type ConnectOptions = {
-  silent_mode: boolean
+export type ConnectArgs = {
+  chainIdHint?: bigint
 }
 
 export abstract class Connector extends EventEmitter<ConnectorEvents> {
@@ -45,7 +45,7 @@ export abstract class Connector extends EventEmitter<ConnectorEvents> {
   /** Whether connector is already authorized */
   abstract ready(): Promise<boolean>
   /** Connect wallet. */
-  abstract connect(params?: ConnectOptions): Promise<ConnectorData>
+  abstract connect(params?: ConnectArgs): Promise<ConnectorData>
   /** Disconnect wallet. */
   abstract disconnect(): Promise<void>
   /** Get current account silently. Return null if the account is not authorized */

diff --git a/src/connectors/injected/index.ts b/src/connectors/injected/index.ts
@@ -18,7 +18,7 @@ import {
 } from "../../errors"
 import { removeStarknetLastConnectedWallet } from "../../helpers/lastConnected"
 import {
-  ConnectOptions,
+  ConnectArgs,
   Connector,
   type ConnectorData,
   type ConnectorIcons,
@@ -132,7 +132,7 @@ export class InjectedConnector extends Connector {
     return new Account(provider, accounts[0], "")
   }
 
-  async connect(params: ConnectOptions): Promise<ConnectorData> {
+  async connect(_args: ConnectArgs = {}): Promise<ConnectorData> {
     this.ensureWallet()
 
     if (!this._wallet) {
@@ -141,16 +141,9 @@ export class InjectedConnector extends Connector {
 
     let accounts: string[]
     try {
-      accounts = await this.request(
-        params
-          ? {
-              type: "wallet_requestAccounts",
-              params,
-            }
-          : {
-              type: "wallet_requestAccounts",
-            },
-      )
+      accounts = await this.request({
+        type: "wallet_requestAccounts",
+      })
     } catch {
       throw new UserRejectedRequestError()
     }

diff --git a/src/connectors/webwallet/index.ts b/src/connectors/webwallet/index.ts
@@ -20,6 +20,7 @@ import {
 import { getStarknetChainId } from "../../helpers/getStarknetChainId"
 import { removeStarknetLastConnectedWallet } from "../../helpers/lastConnected"
 import {
+  ConnectArgs,
   Connector,
   type ConnectorData,
   type ConnectorIcons,
@@ -100,7 +101,7 @@ export class WebWalletConnector extends Connector {
     return "Powered by Argent"
   }
 
-  async connect(): Promise<ConnectorData> {
+  async connect(_args: ConnectArgs = {}): Promise<ConnectorData> {
     await this.ensureWallet()
 
     if (!this._wallet) {

diff --git a/src/main.ts b/src/main.ts
@@ -21,7 +21,6 @@ import type {
 
 let selectedConnector: StarknetkitConnector | null = null
 
-
 /**
  *
  * @param [modalMode="canAsk"] - Choose connection behavior:
@@ -80,9 +79,7 @@ export const connect = async ({
       let connectorData: ConnectorData | null = null
 
       if (connector && resultType === "wallet") {
-        connectorData = await connector.connect({
-          silent_mode: true,
-        })
+        connectorData = await connector.connect()
       }
 
       return {