@cometh/connect-react-hooks 0.0.11-dev.1 → 0.0.11-dev.2

package/dist/index.cjs

@@ -104,14 +104,17 @@ var ConnectProvider = ({
       const paymasterUrl = _optionalChain([config, 'access', _8 => _8.networksConfig, 'access', _9 => _9.find, 'call', _10 => _10(
         (network) => _optionalChain([network, 'access', _11 => _11.chain, 'optionalAccess', _12 => _12.id]) === chain.id
       ), 'optionalAccess', _13 => _13.paymasterUrl]);
-      if (!bundlerUrl || !paymasterUrl)
-        throw new Error("Bundler or paymaster url not found");
+      const rpcUrl = _optionalChain([config, 'access', _14 => _14.networksConfig, 'access', _15 => _15.find, 'call', _16 => _16(
+        (network) => _optionalChain([network, 'access', _17 => _17.chain, 'optionalAccess', _18 => _18.id]) === chain.id
+      ), 'optionalAccess', _19 => _19.rpcUrl]);
+      if (!bundlerUrl) throw new Error("Bundler url not found");
       try {
         const { client, address: newAddress } = await createSmartAccount({
           ...config,
           chain,
           bundlerUrl,
           paymasterUrl,
+          rpcUrl,
           smartAccountAddress: params.address,
           comethSignerConfig: {
             ...config.comethSignerConfig,
@@ -168,8 +171,8 @@ var useAccount = () => {
   const { smartAccountClient, smartAccountAddress } = context;
   const { chain, chainId } = _react.useMemo.call(void 0, 
     () => ({
-      chain: _optionalChain([smartAccountClient, 'optionalAccess', _14 => _14.chain]),
-      chainId: _optionalChain([smartAccountClient, 'optionalAccess', _15 => _15.chain, 'optionalAccess', _16 => _16.id])
+      chain: _optionalChain([smartAccountClient, 'optionalAccess', _20 => _20.chain]),
+      chainId: _optionalChain([smartAccountClient, 'optionalAccess', _21 => _21.chain, 'optionalAccess', _22 => _22.id])
     }),
     [smartAccountClient]
   );
@@ -385,7 +388,7 @@ var FocusManager = (_a = class extends Subscribable {
     if (typeof __privateGet(this, _focused) === "boolean") {
       return __privateGet(this, _focused);
     }
-    return _optionalChain([globalThis, 'access', _17 => _17.document, 'optionalAccess', _18 => _18.visibilityState]) !== "hidden";
+    return _optionalChain([globalThis, 'access', _23 => _23.document, 'optionalAccess', _24 => _24.visibilityState]) !== "hidden";
   }
 }, _focused = new WeakMap(), _cleanup = new WeakMap(), _setup = new WeakMap(), _a);
 var focusManager = new FocusManager();
@@ -675,7 +678,7 @@ var QueryObserver = (_a3 = class extends Subscribable {
         enumerable: true,
         get: () => {
           this.trackProp(key);
-          _optionalChain([onPropTracked, 'optionalCall', _19 => _19(key)]);
+          _optionalChain([onPropTracked, 'optionalCall', _25 => _25(key)]);
           return result[key];
         }
       });
@@ -736,13 +739,13 @@ var QueryObserver = (_a3 = class extends Subscribable {
     }
     let { error, errorUpdatedAt, status } = newState;
     if (options.select && newState.data !== void 0) {
-      if (prevResult && newState.data === _optionalChain([prevResultState, 'optionalAccess', _20 => _20.data]) && options.select === __privateGet(this, _selectFn)) {
+      if (prevResult && newState.data === _optionalChain([prevResultState, 'optionalAccess', _26 => _26.data]) && options.select === __privateGet(this, _selectFn)) {
         data = __privateGet(this, _selectResult);
       } else {
         try {
           __privateSet(this, _selectFn, options.select);
           data = options.select(newState.data);
-          data = replaceData(_optionalChain([prevResult, 'optionalAccess', _21 => _21.data]), data, options);
+          data = replaceData(_optionalChain([prevResult, 'optionalAccess', _27 => _27.data]), data, options);
           __privateSet(this, _selectResult, data);
           __privateSet(this, _selectError, null);
         } catch (selectError) {
@@ -754,11 +757,11 @@ var QueryObserver = (_a3 = class extends Subscribable {
     }
     if (options.placeholderData !== void 0 && data === void 0 && status === "pending") {
       let placeholderData;
-      if (_optionalChain([prevResult, 'optionalAccess', _22 => _22.isPlaceholderData]) && options.placeholderData === _optionalChain([prevResultOptions, 'optionalAccess', _23 => _23.placeholderData])) {
+      if (_optionalChain([prevResult, 'optionalAccess', _28 => _28.isPlaceholderData]) && options.placeholderData === _optionalChain([prevResultOptions, 'optionalAccess', _29 => _29.placeholderData])) {
         placeholderData = prevResult.data;
       } else {
         placeholderData = typeof options.placeholderData === "function" ? options.placeholderData(
-          _optionalChain([__privateGet, 'call', _24 => _24(this, _lastQueryWithDefinedData), 'optionalAccess', _25 => _25.state, 'access', _26 => _26.data]),
+          _optionalChain([__privateGet, 'call', _30 => _30(this, _lastQueryWithDefinedData), 'optionalAccess', _31 => _31.state, 'access', _32 => _32.data]),
           __privateGet(this, _lastQueryWithDefinedData)
         ) : options.placeholderData;
         if (options.select && placeholderData !== void 0) {
@@ -773,7 +776,7 @@ var QueryObserver = (_a3 = class extends Subscribable {
       if (placeholderData !== void 0) {
         status = "success";
         data = replaceData(
-          _optionalChain([prevResult, 'optionalAccess', _27 => _27.data]),
+          _optionalChain([prevResult, 'optionalAccess', _33 => _33.data]),
           placeholderData,
           options
         );
@@ -853,7 +856,7 @@ var QueryObserver = (_a3 = class extends Subscribable {
         return changed && includedProps.has(typedKey);
       });
     };
-    if (_optionalChain([notifyOptions, 'optionalAccess', _28 => _28.listeners]) !== false && shouldNotifyListeners()) {
+    if (_optionalChain([notifyOptions, 'optionalAccess', _34 => _34.listeners]) !== false && shouldNotifyListeners()) {
       defaultNotifyOptions.listeners = true;
     }
     __privateMethod(this, _QueryObserver_instances, notify_fn).call(this, { ...defaultNotifyOptions, ...notifyOptions });
@@ -870,7 +873,7 @@ var QueryObserver = (_a3 = class extends Subscribable {
     this.options,
     fetchOptions
   );
-  if (!_optionalChain([fetchOptions, 'optionalAccess', _29 => _29.throwOnError])) {
+  if (!_optionalChain([fetchOptions, 'optionalAccess', _35 => _35.throwOnError])) {
     promise = promise.catch(noop);
   }
   return promise;
@@ -925,7 +928,7 @@ var QueryObserver = (_a3 = class extends Subscribable {
   __privateSet(this, _currentQuery, query);
   __privateSet(this, _currentQueryInitialState, query.state);
   if (this.hasListeners()) {
-    _optionalChain([prevQuery, 'optionalAccess', _30 => _30.removeObserver, 'call', _31 => _31(this)]);
+    _optionalChain([prevQuery, 'optionalAccess', _36 => _36.removeObserver, 'call', _37 => _37(this)]);
     query.addObserver(this);
   }
 }, notify_fn = function(notifyOptions) {
@@ -996,15 +999,15 @@ var MutationObserver = (_a4 = class extends Subscribable {
         observer: this
       });
     }
-    if (_optionalChain([prevOptions, 'optionalAccess', _32 => _32.mutationKey]) && this.options.mutationKey && hashKey(prevOptions.mutationKey) !== hashKey(this.options.mutationKey)) {
+    if (_optionalChain([prevOptions, 'optionalAccess', _38 => _38.mutationKey]) && this.options.mutationKey && hashKey(prevOptions.mutationKey) !== hashKey(this.options.mutationKey)) {
       this.reset();
-    } else if (_optionalChain([__privateGet, 'call', _33 => _33(this, _currentMutation), 'optionalAccess', _34 => _34.state, 'access', _35 => _35.status]) === "pending") {
+    } else if (_optionalChain([__privateGet, 'call', _39 => _39(this, _currentMutation), 'optionalAccess', _40 => _40.state, 'access', _41 => _41.status]) === "pending") {
       __privateGet(this, _currentMutation).setOptions(this.options);
     }
   }
   onUnsubscribe() {
     if (!this.hasListeners()) {
-      _optionalChain([__privateGet, 'call', _36 => _36(this, _currentMutation), 'optionalAccess', _37 => _37.removeObserver, 'call', _38 => _38(this)]);
+      _optionalChain([__privateGet, 'call', _42 => _42(this, _currentMutation), 'optionalAccess', _43 => _43.removeObserver, 'call', _44 => _44(this)]);
     }
   }
   onMutationUpdate(action) {
@@ -1015,20 +1018,20 @@ var MutationObserver = (_a4 = class extends Subscribable {
     return __privateGet(this, _currentResult2);
   }
   reset() {
-    _optionalChain([__privateGet, 'call', _39 => _39(this, _currentMutation), 'optionalAccess', _40 => _40.removeObserver, 'call', _41 => _41(this)]);
+    _optionalChain([__privateGet, 'call', _45 => _45(this, _currentMutation), 'optionalAccess', _46 => _46.removeObserver, 'call', _47 => _47(this)]);
     __privateSet(this, _currentMutation, void 0);
     __privateMethod(this, _MutationObserver_instances, updateResult_fn).call(this);
     __privateMethod(this, _MutationObserver_instances, notify_fn2).call(this);
   }
   mutate(variables, options) {
     __privateSet(this, _mutateOptions, options);
-    _optionalChain([__privateGet, 'call', _42 => _42(this, _currentMutation), 'optionalAccess', _43 => _43.removeObserver, 'call', _44 => _44(this)]);
+    _optionalChain([__privateGet, 'call', _48 => _48(this, _currentMutation), 'optionalAccess', _49 => _49.removeObserver, 'call', _50 => _50(this)]);
     __privateSet(this, _currentMutation, __privateGet(this, _client2).getMutationCache().build(__privateGet(this, _client2), this.options));
     __privateGet(this, _currentMutation).addObserver(this);
     return __privateGet(this, _currentMutation).execute(variables);
   }
 }, _client2 = new WeakMap(), _currentResult2 = new WeakMap(), _currentMutation = new WeakMap(), _mutateOptions = new WeakMap(), _MutationObserver_instances = new WeakSet(), updateResult_fn = function() {
-  const state = _nullishCoalesce(_optionalChain([__privateGet, 'call', _45 => _45(this, _currentMutation), 'optionalAccess', _46 => _46.state]), () => ( getDefaultState()));
+  const state = _nullishCoalesce(_optionalChain([__privateGet, 'call', _51 => _51(this, _currentMutation), 'optionalAccess', _52 => _52.state]), () => ( getDefaultState()));
   __privateSet(this, _currentResult2, {
     ...state,
     isPending: state.status === "pending",
@@ -1043,12 +1046,12 @@ var MutationObserver = (_a4 = class extends Subscribable {
     if (__privateGet(this, _mutateOptions) && this.hasListeners()) {
       const variables = __privateGet(this, _currentResult2).variables;
       const context = __privateGet(this, _currentResult2).context;
-      if (_optionalChain([action, 'optionalAccess', _47 => _47.type]) === "success") {
-        _optionalChain([__privateGet, 'call', _48 => _48(this, _mutateOptions), 'access', _49 => _49.onSuccess, 'optionalCall', _50 => _50(action.data, variables, context)]);
-        _optionalChain([__privateGet, 'call', _51 => _51(this, _mutateOptions), 'access', _52 => _52.onSettled, 'optionalCall', _53 => _53(action.data, null, variables, context)]);
-      } else if (_optionalChain([action, 'optionalAccess', _54 => _54.type]) === "error") {
-        _optionalChain([__privateGet, 'call', _55 => _55(this, _mutateOptions), 'access', _56 => _56.onError, 'optionalCall', _57 => _57(action.error, variables, context)]);
-        _optionalChain([__privateGet, 'call', _58 => _58(this, _mutateOptions), 'access', _59 => _59.onSettled, 'optionalCall', _60 => _60(
+      if (_optionalChain([action, 'optionalAccess', _53 => _53.type]) === "success") {
+        _optionalChain([__privateGet, 'call', _54 => _54(this, _mutateOptions), 'access', _55 => _55.onSuccess, 'optionalCall', _56 => _56(action.data, variables, context)]);
+        _optionalChain([__privateGet, 'call', _57 => _57(this, _mutateOptions), 'access', _58 => _58.onSettled, 'optionalCall', _59 => _59(action.data, null, variables, context)]);
+      } else if (_optionalChain([action, 'optionalAccess', _60 => _60.type]) === "error") {
+        _optionalChain([__privateGet, 'call', _61 => _61(this, _mutateOptions), 'access', _62 => _62.onError, 'optionalCall', _63 => _63(action.error, variables, context)]);
+        _optionalChain([__privateGet, 'call', _64 => _64(this, _mutateOptions), 'access', _65 => _65.onSettled, 'optionalCall', _66 => _66(
           void 0,
           action.error,
           variables,
@@ -1148,7 +1151,7 @@ var ensureStaleTime = (defaultedOptions) => {
     }
   }
 };
-var shouldSuspend = (defaultedOptions, result) => _optionalChain([defaultedOptions, 'optionalAccess', _61 => _61.suspense]) && result.isPending;
+var shouldSuspend = (defaultedOptions, result) => _optionalChain([defaultedOptions, 'optionalAccess', _67 => _67.suspense]) && result.isPending;
 var fetchOptimistic = (defaultedOptions, observer, errorResetBoundary) => observer.fetchOptimistic(defaultedOptions).catch(() => {
   errorResetBoundary.clearReset();
 });
@@ -1167,7 +1170,7 @@ function useBaseQuery(options, Observer, queryClient) {
   const isRestoring = useIsRestoring();
   const errorResetBoundary = useQueryErrorResetBoundary();
   const defaultedOptions = client.defaultQueryOptions(options);
-  _optionalChain([client, 'access', _62 => _62.getDefaultOptions, 'call', _63 => _63(), 'access', _64 => _64.queries, 'optionalAccess', _65 => _65._experimental_beforeQuery, 'optionalCall', _66 => _66(
+  _optionalChain([client, 'access', _68 => _68.getDefaultOptions, 'call', _69 => _69(), 'access', _70 => _70.queries, 'optionalAccess', _71 => _71._experimental_beforeQuery, 'optionalCall', _72 => _72(
     defaultedOptions
   )]);
   defaultedOptions._optimisticResults = isRestoring ? "isRestoring" : "optimistic";
@@ -1208,7 +1211,7 @@ function useBaseQuery(options, Observer, queryClient) {
     throw result.error;
   }
   ;
-  _optionalChain([client, 'access', _67 => _67.getDefaultOptions, 'call', _68 => _68(), 'access', _69 => _69.queries, 'optionalAccess', _70 => _70._experimental_afterQuery, 'optionalCall', _71 => _71(
+  _optionalChain([client, 'access', _73 => _73.getDefaultOptions, 'call', _74 => _74(), 'access', _75 => _75.queries, 'optionalAccess', _76 => _76._experimental_afterQuery, 'optionalCall', _77 => _77(
     defaultedOptions,
     result
   )]);
@@ -1412,7 +1415,7 @@ var useConnect = () => {
       setIsPending(true);
       setError(null);
       updateSmartAccountClient(params).then(() => {
-        _optionalChain([queryClient, 'optionalAccess', _72 => _72.invalidateQueries, 'call', _73 => _73({
+        _optionalChain([queryClient, 'optionalAccess', _78 => _78.invalidateQueries, 'call', _79 => _79({
           queryKey: ["connect"]
         })]);
       }).catch((e) => {
@@ -1430,7 +1433,7 @@ var useConnect = () => {
       setError(null);
       try {
         await updateSmartAccountClient(params);
-        _optionalChain([queryClient, 'optionalAccess', _74 => _74.invalidateQueries, 'call', _75 => _75({ queryKey: ["connect"] })]);
+        _optionalChain([queryClient, 'optionalAccess', _80 => _80.invalidateQueries, 'call', _81 => _81({ queryKey: ["connect"] })]);
       } catch (e) {
         const err = e instanceof Error ? e : new Error("An error occurred");
         setError(err);
@@ -1463,7 +1466,7 @@ var useDisconnect = () => {
     setIsPending(true);
     setError(null);
     disconnectSmartAccount().then(() => {
-      _optionalChain([queryClient, 'optionalAccess', _76 => _76.invalidateQueries, 'call', _77 => _77({
+      _optionalChain([queryClient, 'optionalAccess', _82 => _82.invalidateQueries, 'call', _83 => _83({
         queryKey: ["connect"]
       })]);
     }).catch((e) => {
@@ -1478,7 +1481,7 @@ var useDisconnect = () => {
     setError(null);
     try {
       await disconnectSmartAccount();
-      _optionalChain([queryClient, 'optionalAccess', _78 => _78.invalidateQueries, 'call', _79 => _79({ queryKey: ["connect"] })]);
+      _optionalChain([queryClient, 'optionalAccess', _84 => _84.invalidateQueries, 'call', _85 => _85({ queryKey: ["connect"] })]);
     } catch (e) {
       const err = e instanceof Error ? e : new Error("An error occurred during disconnection");
       setError(err);
@@ -1915,7 +1918,7 @@ var useCreateNewSigner = (apiKey, baseUrl) => {
       setIsPending(true);
       setError(null);
       _connectsdk4337.createNewSigner.call(void 0, { apiKey, baseUrl, params }).then((signer) => {
-        _optionalChain([queryClient, 'optionalAccess', _80 => _80.invalidateQueries, 'call', _81 => _81({ queryKey: ["signer"] })]);
+        _optionalChain([queryClient, 'optionalAccess', _86 => _86.invalidateQueries, 'call', _87 => _87({ queryKey: ["signer"] })]);
         return signer;
       }).catch((e) => {
         const err = e instanceof Error ? e : new Error("An error occurred");
@@ -1936,7 +1939,7 @@ var useCreateNewSigner = (apiKey, baseUrl) => {
           baseUrl,
           params
         });
-        _optionalChain([queryClient, 'optionalAccess', _82 => _82.invalidateQueries, 'call', _83 => _83({ queryKey: ["signer"] })]);
+        _optionalChain([queryClient, 'optionalAccess', _88 => _88.invalidateQueries, 'call', _89 => _89({ queryKey: ["signer"] })]);
         return signer;
       } catch (e) {
         const err = e instanceof Error ? e : new Error("An error occurred");
@@ -2205,10 +2208,10 @@ var useSwitchChain = () => {
       }
       try {
         await updateSmartAccountClient({
-          address: _optionalChain([smartAccountClient, 'optionalAccess', _84 => _84.account, 'access', _85 => _85.address]),
+          address: _optionalChain([smartAccountClient, 'optionalAccess', _90 => _90.account, 'access', _91 => _91.address]),
           chain
         });
-        _optionalChain([queryClient, 'optionalAccess', _86 => _86.invalidateQueries, 'call', _87 => _87({
+        _optionalChain([queryClient, 'optionalAccess', _92 => _92.invalidateQueries, 'call', _93 => _93({
           queryKey: ["switchChain"]
         })]);
       } catch (e) {
@@ -2224,7 +2227,7 @@ var useSwitchChain = () => {
   );
   const switchChain = _react.useCallback.call(void 0, 
     (params) => {
-      if (!address) throw new Error("No connected wallet");
+      if (!address) throw new Error("Wallet is not connected");
       setIsPending(true);
       setError(null);
       switchChainInternal(params).catch((e) => {
@@ -2240,7 +2243,7 @@ var useSwitchChain = () => {
   );
   const switchChainAsync = _react.useCallback.call(void 0, 
     async (params) => {
-      if (!address) throw new Error("No connected wallet");
+      if (!address) throw new Error("Wallet is not connected");
       setIsPending(true);
       setError(null);
       try {

package/dist/index.d.cts

@@ -45,14 +45,12 @@ type NetworkParams = {
     chain?: Chain;
     bundlerUrl?: string;
     paymasterUrl?: string;
+    rpcUrl?: string;
 };
-type OmitConfig<T> = Omit<T, "chain" | "paymasterUrl" | "bundlerUrl"> & {
+type OmitConfig<T> = Omit<T, "chain" | "paymasterUrl" | "bundlerUrl" | "rpcUrl"> & {
     networksConfig: NetworkParams[];
 };
-type ConnectConfig = OmitConfig<createSafeSmartAccountParameters<ENTRYPOINT_ADDRESS_V07_TYPE> & {
-    bundlerUrl: string;
-    paymasterUrl?: string;
-}>;
+type ConnectConfig = OmitConfig<createSafeSmartAccountParameters<ENTRYPOINT_ADDRESS_V07_TYPE>>;
 type ContextComethSmartAccountClient = ComethSmartAccountClient<SafeSmartAccount<ENTRYPOINT_ADDRESS_V07_TYPE, Transport, Chain>, Transport, Chain, ENTRYPOINT_ADDRESS_V07_TYPE>;
 declare const ConnectProvider: <TConfig extends ConnectConfig, TQueryClient extends b | undefined>({ children, config, queryClient, }: {
     children: ReactNode;

package/dist/index.d.ts

@@ -45,14 +45,12 @@ type NetworkParams = {
     chain?: Chain;
     bundlerUrl?: string;
     paymasterUrl?: string;
+    rpcUrl?: string;
 };
-type OmitConfig<T> = Omit<T, "chain" | "paymasterUrl" | "bundlerUrl"> & {
+type OmitConfig<T> = Omit<T, "chain" | "paymasterUrl" | "bundlerUrl" | "rpcUrl"> & {
     networksConfig: NetworkParams[];
 };
-type ConnectConfig = OmitConfig<createSafeSmartAccountParameters<ENTRYPOINT_ADDRESS_V07_TYPE> & {
-    bundlerUrl: string;
-    paymasterUrl?: string;
-}>;
+type ConnectConfig = OmitConfig<createSafeSmartAccountParameters<ENTRYPOINT_ADDRESS_V07_TYPE>>;
 type ContextComethSmartAccountClient = ComethSmartAccountClient<SafeSmartAccount<ENTRYPOINT_ADDRESS_V07_TYPE, Transport, Chain>, Transport, Chain, ENTRYPOINT_ADDRESS_V07_TYPE>;
 declare const ConnectProvider: <TConfig extends ConnectConfig, TQueryClient extends b | undefined>({ children, config, queryClient, }: {
     children: ReactNode;

package/dist/index.js

@@ -104,14 +104,17 @@ var ConnectProvider = ({
       const paymasterUrl = config.networksConfig.find(
         (network) => network.chain?.id === chain.id
       )?.paymasterUrl;
-      if (!bundlerUrl || !paymasterUrl)
-        throw new Error("Bundler or paymaster url not found");
+      const rpcUrl = config.networksConfig.find(
+        (network) => network.chain?.id === chain.id
+      )?.rpcUrl;
+      if (!bundlerUrl) throw new Error("Bundler url not found");
       try {
         const { client, address: newAddress } = await createSmartAccount({
           ...config,
           chain,
           bundlerUrl,
           paymasterUrl,
+          rpcUrl,
           smartAccountAddress: params.address,
           comethSignerConfig: {
             ...config.comethSignerConfig,
@@ -2224,7 +2227,7 @@ var useSwitchChain = () => {
   );
   const switchChain = useCallback8(
     (params) => {
-      if (!address) throw new Error("No connected wallet");
+      if (!address) throw new Error("Wallet is not connected");
       setIsPending(true);
       setError(null);
       switchChainInternal(params).catch((e) => {
@@ -2240,7 +2243,7 @@ var useSwitchChain = () => {
   );
   const switchChainAsync = useCallback8(
     async (params) => {
-      if (!address) throw new Error("No connected wallet");
+      if (!address) throw new Error("Wallet is not connected");
       setIsPending(true);
       setError(null);
       try {

package/package.json

@@ -7,7 +7,7 @@
       "url": "https://twitter.com/slovaye"
     }
   ],
-  "version": "0.0.11-dev.1",
+  "version": "0.0.11-dev.2",
   "description": "React hooks Connect 4337",
   "repository": "https://github.com/cometh-hq/connect-sdk-4337.git",
   "keywords": [