release 1.1.3

package.json

@@ -1,6 +1,6 @@
 {
   "name": "starknetkit",
-  "version": "1.0.29",
+  "version": "1.1.1",
   "repository": "github:argentlabs/starknetkit",
   "private": false,
   "browser": {

src/connectors/argentMobile/constants.ts

@@ -13,3 +13,9 @@ export const DEFAULT_ARGENT_MOBILE_ICON = `<svg
       fill="white"
     />
   </svg>`
+
+export const RPC_NODE_URL_TESTNET =
+  "https://api.hydrogen.argent47.net/v1/starknet/goerli/rpc/v0.5"
+
+export const RPC_NODE_URL_MAINNET =
+  "https://cloud.argent-api.com/v1/starknet/mainnet/rpc/v0.5"

src/connectors/argentMobile/index.ts

@@ -9,6 +9,7 @@ import {
   ConnectorNotConnectedError,
   ConnectorNotFoundError,
   UserNotConnectedError,
+  UserRejectedRequestError,
 } from "../../errors"
 import { resetWalletConnect } from "../../helpers/resetWalletConnect"
 import {
@@ -18,6 +19,7 @@ import {
 } from "../connector"
 import type { StarknetAdapter } from "./modal/starknet/adapter"
 import { removeStarknetLastConnectedWallet } from "../../helpers/lastConnected"
+import { RPC_NODE_URL_MAINNET, RPC_NODE_URL_TESTNET } from "./constants"
 
 export interface ArgentMobileConnectorOptions {
   dappName?: string
@@ -27,6 +29,7 @@ export interface ArgentMobileConnectorOptions {
   url?: string
   icons?: string[]
   provider?: ProviderInterface
+  rpcUrl?: string
 }
 
 export class ArgentMobileConnector extends Connector {
@@ -43,6 +46,9 @@ export class ArgentMobileConnector extends Connector {
   }
 
   async ready(): Promise<boolean> {
+    // check if session is valid and retrieve the wallet
+    // if no sessions, it will show the login modal
+    await this.ensureWallet()
     if (!this._wallet) {
       return false
     }
@@ -145,19 +151,32 @@ export class ArgentMobileConnector extends Connector {
 
   private async ensureWallet(): Promise<void> {
     const { getStarknetWindowObject } = await import("./modal")
-    const { chainId, projectId, dappName, description, url, icons } =
-      this._options
+    const {
+      chainId,
+      projectId,
+      dappName,
+      description,
+      url,
+      icons,
+      provider,
+      rpcUrl,
+    } = this._options
+
+    const providerRpcUrl =
+      rpcUrl ??
+      (!chainId || chainId === constants.NetworkName.SN_MAIN
+        ? RPC_NODE_URL_MAINNET
+        : RPC_NODE_URL_TESTNET)
+
     const options = {
       chainId: chainId ?? constants.NetworkName.SN_MAIN,
       name: dappName,
       projectId: projectId ?? DEFAULT_PROJECT_ID,
       description,
       url,
       icons,
-      rpcUrl:
-        chainId === constants.NetworkName.SN_MAIN
-          ? "https://cloud.argent-api.com/v1/starknet/mainnet/rpc/v0.5"
-          : "https://api.hydrogen.argent47.net/v1/starknet/goerli/rpc/v0.5",
+      provider,
+      rpcUrl: providerRpcUrl,
     }
 
     if (projectId === DEFAULT_PROJECT_ID) {
@@ -177,11 +196,9 @@ export class ArgentMobileConnector extends Connector {
 
     const _wallet = await getStarknetWindowObject(options)
 
-    const { provider } = this._options
-    if (provider) {
-      Object.assign(_wallet, {
-        provider,
-      })
+    // getStarknetWindowObject returns null when the user rejects the connection
+    if (!_wallet) {
+      throw new UserRejectedRequestError()
     }
 
     this._wallet = _wallet

src/connectors/argentMobile/modal/adapter.ts

@@ -14,11 +14,13 @@ import {
 } from "@walletconnect/utils"
 
 import type { EthereumRpcConfig } from "./starknet/adapter"
+import { ProviderInterface } from "starknet"
 
 export interface NamespaceAdapterOptions {
   client: SignClient
   chainId?: string | number
   rpcUrl?: string
+  provider: ProviderInterface
 }
 
 export abstract class NamespaceAdapter {

src/connectors/argentMobile/modal/login.ts

@@ -1,7 +1,7 @@
 import SignClient from "@walletconnect/sign-client"
 import type { SignClientTypes } from "@walletconnect/types"
 
-import { constants } from "starknet"
+import { ProviderInterface, constants } from "starknet"
 
 // Using NetworkName as a value.
 const Network: typeof constants.NetworkName = constants.NetworkName
@@ -22,6 +22,7 @@ export interface IArgentLoginOptions {
   mobileUrl?: string
   modalType?: "overlay" | "window"
   walletConnect?: SignClientTypes.Options
+  provider?: ProviderInterface
 }
 
 export const login = async <TAdapter extends NamespaceAdapter>(
@@ -37,6 +38,7 @@ export const login = async <TAdapter extends NamespaceAdapter>(
     url,
     icons,
     walletConnect,
+    provider,
   }: IArgentLoginOptions,
   Adapter: new (options: NamespaceAdapterOptions) => TAdapter,
 ): Promise<TAdapter | null> => {
@@ -63,7 +65,7 @@ export const login = async <TAdapter extends NamespaceAdapter>(
   }
 
   const client = await SignClient.init(signClientOptions)
-  const adapter = new Adapter({ client, chainId, rpcUrl })
+  const adapter = new Adapter({ client, chainId, rpcUrl, provider })
 
   client.on("session_event", (_) => {
     // Handle session events, such as "chainChanged", "accountsChanged", etc.

src/connectors/argentMobile/modal/starknet/adapter.ts

@@ -63,10 +63,10 @@ export class StarknetAdapter
 
   private walletRpc: IStarknetRpc
 
-  constructor({ client, chainId, rpcUrl }: NamespaceAdapterOptions) {
+  constructor({ client, chainId, rpcUrl, provider }: NamespaceAdapterOptions) {
     super()
 
-    this.chainId = String(chainId || "SN_GOERLI")
+    this.chainId = String(chainId ?? constants.NetworkName.SN_MAIN)
     this.rpc = {
       chains: chainId ? [this.formatChainId(this.chainId)] : [],
       methods: this.methods,
@@ -84,7 +84,7 @@ export class StarknetAdapter
 
     this.remoteSigner = new StarknetRemoteSigner(this.walletRpc)
 
-    this.provider = new RpcProvider({ nodeUrl: rpcUrl })
+    this.provider = provider ? provider : new RpcProvider({ nodeUrl: rpcUrl })
     this.account = new StarknetRemoteAccount(
       this.provider,
       "",
@@ -127,7 +127,8 @@ export class StarknetAdapter
   }
 
   async isPreauthorized(): Promise<boolean> {
-    throw new Error("Not implemented: .isPreauthorized()")
+    // check if wc session is valid, if so, return true
+    return Boolean(this.client.session.getAll().find(this.isValidSession))
   }
 
   on: ConnectedStarknetWindowObject["on"] = (event, handleEvent) => {

src/connectors/injected/index.ts

@@ -15,6 +15,7 @@ import {
   WALLET_NOT_FOUND_ICON_DARK,
   WALLET_NOT_FOUND_ICON_LIGHT,
 } from "./constants"
+import { removeStarknetLastConnectedWallet } from "../../helpers/lastConnected"
 /** Injected connector options. */
 export interface InjectedConnectorOptions {
   /** The wallet id. */
@@ -153,7 +154,7 @@ export class InjectedConnector extends Connector {
 
   async disconnect(): Promise<void> {
     this.ensureWallet()
-
+    removeStarknetLastConnectedWallet()
     if (!this.available()) {
       throw new ConnectorNotFoundError()
     }

src/connectors/webwallet/index.ts

@@ -18,6 +18,7 @@ import {
 } from "../../errors"
 import { DEFAULT_WEBWALLET_ICON, DEFAULT_WEBWALLET_URL } from "./constants"
 import { getWebWalletStarknetObject } from "./starknetWindowObject/getWebWalletStarknetObject"
+import { removeStarknetLastConnectedWallet } from "../../helpers/lastConnected"
 
 let _wallet: StarknetWindowObject | null = null
 
@@ -119,6 +120,7 @@ export class WebWalletConnector extends Connector {
     }
     _wallet = null
     this._wallet = _wallet
+    removeStarknetLastConnectedWallet()
   }
 
   async account(): Promise<AccountInterface> {

src/helpers/defaultConnectors.ts

@@ -16,7 +16,10 @@ export const defaultConnectors = ({
   webWalletUrl?: string
   provider?: ProviderInterface
 }): Connector[] => {
-  const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent)
+  const isSafari =
+    typeof window !== "undefined"
+      ? /^((?!chrome|android).)*safari/i.test(navigator.userAgent)
+      : false
 
   const defaultConnectors: Connector[] = []
 

src/hooks/useStarknetkitConnectModal.ts

@@ -0,0 +1,23 @@
+import { connect } from "../main"
+import { ConnectOptions, ModalResult } from "../types/modal"
+
+type UseStarknetkitConnectors = {
+  starknetkitConnectModal: () => Promise<ModalResult>
+}
+
+const useStarknetkitConnectModal = (
+  options: Omit<ConnectOptions, "argentMobileOptions" | "webWalletUrl">,
+): UseStarknetkitConnectors => {
+  const starknetkitConnectModal = async (): Promise<ModalResult> => {
+    return await connect({
+      ...options,
+      resultType: options.resultType ?? "connector",
+    })
+  }
+
+  return {
+    starknetkitConnectModal,
+  }
+}
+
+export { useStarknetkitConnectModal }

src/main.ts

@@ -16,9 +16,9 @@ import {
 } from "./helpers/lastConnected"
 import { mapModalWallets } from "./helpers/mapModalWallets"
 import Modal from "./modal/Modal.svelte"
-import type { ConnectOptions, ModalWallet } from "./types/modal"
+import type { ConnectOptions, ModalResult, ModalWallet } from "./types/modal"
 
-import { Connector } from "./connectors"
+import { type Connector } from "./connectors"
 import css from "./theme.css?inline"
 
 let selectedConnector: Connector | null = null
@@ -31,9 +31,10 @@ export const connect = async ({
   webWalletUrl = DEFAULT_WEBWALLET_URL,
   argentMobileOptions,
   connectors = [],
+  resultType = "wallet",
   provider,
   ...restOptions
-}: ConnectOptions = {}): Promise<StarknetWindowObject | null> => {
+}: ConnectOptions = {}): Promise<ModalResult> => {
   // force null in case it was disconnected from mobile app
   selectedConnector = null
   const availableConnectors =
@@ -48,9 +49,17 @@ export const connect = async ({
   const lastWalletId = localStorage.getItem("starknetLastConnectedWallet")
   if (modalMode === "neverAsk") {
     const connector = availableConnectors.find((c) => c.id === lastWalletId)
-    await connector?.connect()
+
+    if (resultType === "wallet") {
+      await connector?.connect()
+    }
+
     selectedConnector = connector ?? null
-    return connector?.wallet ?? null
+
+    return {
+      connector,
+      wallet: connector?.wallet ?? null,
+    }
   }
 
   const installedWallets = await sn.getAvailableWallets(restOptions)
@@ -69,11 +78,19 @@ export const connect = async ({
 
     if (wallet) {
       const connector = availableConnectors.find((c) => c.id === lastWalletId)
-      await connector?.connect()
+
+      if (resultType === "wallet") {
+        await connector?.connect()
+      }
+
       if (connector) {
         selectedConnector = connector
       }
-      return wallet
+
+      return {
+        connector,
+        wallet: connector?.wallet ?? null,
+      }
     } // otherwise fallback to modal
   }
 
@@ -113,16 +130,26 @@ export const connect = async ({
       target: getTarget(),
       props: {
         dappName,
-        callback: async (value: StarknetWindowObject | null) => {
+        callback: async (connector: Connector | null) => {
           try {
-            if (value !== null && value.id !== "argentWebWallet") {
-              setStarknetLastConnectedWallet(value.id)
+            selectedConnector = connector
+
+            if (resultType === "wallet") {
+              await connector?.connect()
+
+              if (connector !== null && connector.id !== "argentWebWallet") {
+                setStarknetLastConnectedWallet(connector.id)
+              }
+
+              resolve({
+                connector,
+                wallet: connector?.wallet ?? null,
+              })
+            } else {
+              resolve({
+                connector,
+              })
             }
-            selectedConnector =
-              availableConnectors.find(
-                (c) => value !== null && c.id === value.id,
-              ) ?? null
-            resolve(value)
           } finally {
             setTimeout(() => modal.$destroy())
           }
@@ -150,7 +177,11 @@ export const disconnect = async (options: DisconnectOptions = {}) => {
 
 export type {
   ConnectedStarknetWindowObject,
+  Connector,
   DisconnectOptions,
   DisconnectedStarknetWindowObject,
   StarknetWindowObject,
+  defaultConnectors as starknetkitDefaultConnectors,
 }
+
+export { useStarknetkitConnectModal } from "./hooks/useStarknetkitConnectModal"