@dynamic-labs/wagmi-connector 2.0.0-alpha.22 → 2.0.0-alpha.24

package/CHANGELOG.md

@@ -1,4 +1,57 @@
 
+## [2.0.0-alpha.24](https://github.com/dynamic-labs/DynamicAuth/compare/v2.0.0-alpha.23...v2.0.0-alpha.24) (2024-04-03)
+
+
+### ⚠ BREAKING CHANGES
+
+* rename otp verification callbacks (#5180)
+* remove deprecated isVerificationInProgress flag and setter (#5089)
+
+### Features
+
+* allow creating embedded wallets even if user signs in with a wallet ([#5093](https://github.com/dynamic-labs/DynamicAuth/issues/5093)) ([ba2dd62](https://github.com/dynamic-labs/DynamicAuth/commit/ba2dd625e0a7bf35018cf8aac8e80bd23b4e3b0f))
+
+
+### Bug Fixes
+
+* api unit test by removing api and sdk versions for assertion ([#5168](https://github.com/dynamic-labs/DynamicAuth/issues/5168)) ([6d3b8ad](https://github.com/dynamic-labs/DynamicAuth/commit/6d3b8adebe62a4f2a7878630384348b2c491d779))
+* bug when phone input is empty ([#5139](https://github.com/dynamic-labs/DynamicAuth/issues/5139)) ([7155b63](https://github.com/dynamic-labs/DynamicAuth/commit/7155b63518d00ba807bc321c6740b341d0a8b82f))
+* clear error message on otp resend for sms ([#5182](https://github.com/dynamic-labs/DynamicAuth/issues/5182)) ([f40b48c](https://github.com/dynamic-labs/DynamicAuth/commit/f40b48c7f58c8e3dfe73fb124d642c3b8f193cee))
+* link farcaster account ([#5170](https://github.com/dynamic-labs/DynamicAuth/issues/5170)) ([10fe272](https://github.com/dynamic-labs/DynamicAuth/commit/10fe272247605b5f09385f063231e2c881399cc8))
+* show correct otp message for sms verification failure ([#5177](https://github.com/dynamic-labs/DynamicAuth/issues/5177)) ([b3bcd76](https://github.com/dynamic-labs/DynamicAuth/commit/b3bcd7694047dac55ce37babb71684a418633f95))
+* update wagmi connector id when wallet connector changes ([#5185](https://github.com/dynamic-labs/DynamicAuth/issues/5185)) ([14fb83a](https://github.com/dynamic-labs/DynamicAuth/commit/14fb83a22c8e39095b79cc9951cae3f00f4fca2f))
+
+
+* remove deprecated isVerificationInProgress flag and setter ([#5089](https://github.com/dynamic-labs/DynamicAuth/issues/5089)) ([060fef7](https://github.com/dynamic-labs/DynamicAuth/commit/060fef70df0c497e7a9b6e67ad0bfafef52c2bbb))
+* rename otp verification callbacks ([#5180](https://github.com/dynamic-labs/DynamicAuth/issues/5180)) ([a580eec](https://github.com/dynamic-labs/DynamicAuth/commit/a580eec02d15b46a25c01d5473e4db2db89937e2))
+
+## [2.0.0-alpha.23](https://github.com/dynamic-labs/DynamicAuth/compare/v2.0.0-alpha.22...v2.0.0-alpha.23) (2024-04-01)
+
+
+### ⚠ BREAKING CHANGES
+
+* implement proper solana embedded wallet signer  (#5092)
+* prevent adding temporary wallet connection to userWallets (#5104)
+
+### Bug Fixes
+
+* Multiple WC bug fixes ([#5142](https://github.com/dynamic-labs/DynamicAuth/issues/5142)) ([92236e6](https://github.com/dynamic-labs/DynamicAuth/commit/92236e6d74c28516403f6df79c539406ece3d6d0)) ([#5132](https://github.com/dynamic-labs/DynamicAuth/issues/5132)) ([99f564a](https://github.com/dynamic-labs/DynamicAuth/commit/99f564a39e35e28af0be2a03617f12aa19cbeb7f))
+
+* Better handling of empty callback queue([#5147](https://github.com/dynamic-labs/DynamicAuth/issues/5147)) ([e2d6bf2](https://github.com/dynamic-labs/DynamicAuth/commit/e2d6bf2444ca01199796ead4136f34b81b6c9b61))
+
+* multiple improvements to the wallet list ([#5112](https://github.com/dynamic-labs/DynamicAuth/issues/5112)) ([00eec5f](https://github.com/dynamic-labs/DynamicAuth/commit/00eec5fde70548c3d771260f3d86e5365e73878d))
+
+* Improved scroll experience on ios ([#5152](https://github.com/dynamic-labs/DynamicAuth/issues/5152)) ([341704f](https://github.com/dynamic-labs/DynamicAuth/commit/341704f99cb6e06f253309f3a8afb1684bb8ae2a))
+
+* better handling of multiwallet state([#5146](https://github.com/dynamic-labs/DynamicAuth/issues/5146)) ([403267b](https://github.com/dynamic-labs/DynamicAuth/commit/403267b3c268d648aba155e0b6fea31d7fdc1b56))
+
+* show correct OTP error message ([#5135](https://github.com/dynamic-labs/DynamicAuth/issues/5135)) ([e7494ce](https://github.com/dynamic-labs/DynamicAuth/commit/e7494cee4a1b5132af91058cbcb2dae0b7eac44b))
+
+* implement proper solana embedded wallet signer  ([#5092](https://github.com/dynamic-labs/DynamicAuth/issues/5092)) ([7749b97](https://github.com/dynamic-labs/DynamicAuth/commit/7749b97db49fb9af8ae0668172f478e1f0c29665))
+
+* prevent adding temporary wallet connection to userWallets ([#5104](https://github.com/dynamic-labs/DynamicAuth/issues/5104)) ([3c02b78](https://github.com/dynamic-labs/DynamicAuth/commit/3c02b781c997c63ff11a7f1c255b92d10962327f))
+
+
 ## [2.0.0-alpha.22](https://github.com/dynamic-labs/DynamicAuth/compare/v2.0.0-alpha.21...v2.0.0-alpha.22) (2024-03-27)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/wagmi-connector",
-  "version": "2.0.0-alpha.22",
+  "version": "2.0.0-alpha.24",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -11,11 +11,11 @@
     "react": "^18.0.0",
     "viem": "2.7.6",
     "wagmi": "2.5.7",
-    "@dynamic-labs/logger": "2.0.0-alpha.22",
-    "@dynamic-labs/rpc-providers": "2.0.0-alpha.22",
-    "@dynamic-labs/sdk-react-core": "2.0.0-alpha.22",
-    "@dynamic-labs/types": "2.0.0-alpha.22",
-    "@dynamic-labs/wallet-connector-core": "2.0.0-alpha.22",
+    "@dynamic-labs/logger": "2.0.0-alpha.24",
+    "@dynamic-labs/rpc-providers": "2.0.0-alpha.24",
+    "@dynamic-labs/sdk-react-core": "2.0.0-alpha.24",
+    "@dynamic-labs/types": "2.0.0-alpha.24",
+    "@dynamic-labs/wallet-connector-core": "2.0.0-alpha.24",
     "eventemitter3": "5.0.1"
   },
   "license": "MIT",

package/src/lib/Connector.d.ts

@@ -1,8 +1,8 @@
 import { MutableRefObject } from 'react';
-import { Connector } from 'wagmi';
 import { Account, Transport, Chain } from 'viem';
-import { Wallet, WalletConnector } from '@dynamic-labs/sdk-react-core';
+import { WalletConnector } from '@dynamic-labs/sdk-react-core';
 export type ConnectorParameters = {
+    connectorId: string;
     handleLogOut: () => Promise<void>;
     walletConnector: WalletConnector;
     preventWagmiSyncFromCallingLogout: MutableRefObject<boolean>;
@@ -58,8 +58,8 @@ export declare const getCreateConnectorFn: (parameters: ConnectorParameters) =>
             [x: `address[${string}]`]: undefined;
             [x: `bool[${string}]`]: undefined;
             [x: `bytes[${string}]`]: undefined;
-            [x: `bytes1[${string}]`]: undefined;
             [x: `bytes16[${string}]`]: undefined;
+            [x: `bytes1[${string}]`]: undefined;
             [x: `bytes2[${string}]`]: undefined;
             [x: `bytes3[${string}]`]: undefined;
             [x: `bytes4[${string}]`]: undefined;
@@ -160,8 +160,8 @@ export declare const getCreateConnectorFn: (parameters: ConnectorParameters) =>
             address?: undefined;
             bool?: undefined;
             bytes?: undefined;
-            bytes1?: undefined;
             bytes16?: undefined;
+            bytes1?: undefined;
             bytes2?: undefined;
             bytes3?: undefined;
             bytes4?: undefined;
@@ -336,8 +336,8 @@ export declare const getCreateConnectorFn: (parameters: ConnectorParameters) =>
             [x: `address[${string}]`]: undefined;
             [x: `bool[${string}]`]: undefined;
             [x: `bytes[${string}]`]: undefined;
-            [x: `bytes1[${string}]`]: undefined;
             [x: `bytes16[${string}]`]: undefined;
+            [x: `bytes1[${string}]`]: undefined;
             [x: `bytes2[${string}]`]: undefined;
             [x: `bytes3[${string}]`]: undefined;
             [x: `bytes4[${string}]`]: undefined;
@@ -438,8 +438,8 @@ export declare const getCreateConnectorFn: (parameters: ConnectorParameters) =>
             address?: undefined;
             bool?: undefined;
             bytes?: undefined;
-            bytes1?: undefined;
             bytes16?: undefined;
+            bytes1?: undefined;
             bytes2?: undefined;
             bytes3?: undefined;
             bytes4?: undefined;
@@ -618,8 +618,8 @@ export declare const getCreateConnectorFn: (parameters: ConnectorParameters) =>
             [x: `address[${string}]`]: undefined;
             [x: `bool[${string}]`]: undefined;
             [x: `bytes[${string}]`]: undefined;
-            [x: `bytes1[${string}]`]: undefined;
             [x: `bytes16[${string}]`]: undefined;
+            [x: `bytes1[${string}]`]: undefined;
             [x: `bytes2[${string}]`]: undefined;
             [x: `bytes3[${string}]`]: undefined;
             [x: `bytes4[${string}]`]: undefined;
@@ -720,8 +720,8 @@ export declare const getCreateConnectorFn: (parameters: ConnectorParameters) =>
             address?: undefined;
             bool?: undefined;
             bytes?: undefined;
-            bytes1?: undefined;
             bytes16?: undefined;
+            bytes1?: undefined;
             bytes2?: undefined;
             bytes3?: undefined;
             bytes4?: undefined;
@@ -835,7 +835,7 @@ export declare const getCreateConnectorFn: (parameters: ConnectorParameters) =>
             uid?: undefined;
         } & Partial<Pick<import("viem").PublicActions<Transport, Chain, Account>, "getChainId" | "prepareTransactionRequest" | "sendRawTransaction" | "call" | "createContractEventFilter" | "createEventFilter" | "estimateContractGas" | "estimateGas" | "getBlock" | "getBlockNumber" | "getContractEvents" | "getEnsText" | "getFilterChanges" | "getGasPrice" | "getLogs" | "getTransaction" | "getTransactionCount" | "getTransactionReceipt" | "readContract" | "simulateContract" | "uninstallFilter" | "watchBlockNumber" | "watchContractEvent"> & Pick<import("viem").WalletActions<Chain, Account>, "sendTransaction" | "writeContract">>>(fn: (client: import("viem").Client<Transport, Chain, Account, import("viem").WalletRpcSchema, import("viem").WalletActions<Chain, Account>>) => client) => import("viem").Client<Transport, Chain, Account, import("viem").WalletRpcSchema, { [K in keyof client]: client[K]; } & import("viem").WalletActions<Chain, Account>>;
     }>;
-    id: `dynamic-${string}`;
+    id: string;
     isAuthorized: () => Promise<boolean>;
     name: "Dynamic";
     onAccountsChanged: (accounts: string[]) => void;
@@ -846,4 +846,3 @@ export declare const getCreateConnectorFn: (parameters: ConnectorParameters) =>
     }) => Promise<Chain>;
     type: "dynamic";
 }, {}>;
-export declare const createConnectorForFirstConnectedEvmWallet: (wallets: Wallet[], createConnector: (wallet: Wallet) => Connector) => Connector | undefined;

package/src/lib/Connector.js

@@ -82,7 +82,7 @@ const getCreateConnectorFn = (parameters) => createConnector((config) => ({
             return (_a = parameters.walletConnector) === null || _a === void 0 ? void 0 : _a.getWalletClient();
         });
     },
-    id: `dynamic-${parameters.walletConnector.key}`,
+    id: parameters.connectorId,
     isAuthorized() {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
@@ -117,12 +117,5 @@ const getCreateConnectorFn = (parameters) => createConnector((config) => ({
     },
     type: 'dynamic',
 }));
-const createConnectorForFirstConnectedEvmWallet = (wallets, createConnector) => {
-    for (const wallet of wallets) {
-        if (wallet.connected && wallet.connector.connectedChain === 'EVM') {
-            return createConnector(wallet);
-        }
-    }
-};
 
-export { createConnectorForFirstConnectedEvmWallet, getCreateConnectorFn };
+export { getCreateConnectorFn };

package/src/lib/DynamicWagmiConnector.js

@@ -2,31 +2,36 @@ import { jsx } from 'react/jsx-runtime';
 import { useRef, useMemo, useEffect } from 'react';
 import { useConfig } from 'wagmi';
 import { useDynamicContext, useUserWallets } from '@dynamic-labs/sdk-react-core';
-import { findAndOrderEvmWallets } from './utils/findAndOrderEvmWallets/findAndOrderEvmWallets.js';
-import { createConnectorForFirstConnectedEvmWallet, getCreateConnectorFn } from './Connector.js';
+import { getCreateConnectorFn } from './Connector.js';
 import { SyncDynamicWagmi } from './SyncDynamicWagmi.js';
 import { useChainMismatchLogger } from './useChainMismatchLogger.js';
+import { useFindEvmWallet } from './hooks/useFindEvmWallet/useFindEvmWallet.js';
+import { useConnectorId } from './hooks/useConnectorId/useConnectorId.js';
 
 const DynamicWagmiConnector = ({ children, }) => {
     const config = useConfig();
     const { handleLogOut, primaryWallet } = useDynamicContext();
+    const wallets = useUserWallets();
     useChainMismatchLogger();
+    const evmWallet = useFindEvmWallet(primaryWallet, wallets);
+    const getConnectorId = useConnectorId();
     /**
      * This will prevent the wagmi Connector from calling handleLogOut when we are the ones calling disconnect
      * as a result of a handleLogOut call (see SyncDynamicWagmi), but will preserve the existing behavior for customers.
      */
     const preventWagmiSyncFromCallingLogout = useRef(false);
-    // Sort places the primary wallet as the first wallet to attempt to connect with
-    const wallets = useUserWallets().sort((wallet) => wallet.address === (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address) ? -1 : 1);
-    const evmWallets = useMemo(() => findAndOrderEvmWallets(primaryWallet, wallets), [primaryWallet, wallets]);
-    const connector = useMemo(() => createConnectorForFirstConnectedEvmWallet(evmWallets, (wallet) => {
-        const connector = config._internal.connectors.setup(getCreateConnectorFn({
+    const connector = useMemo(() => {
+        if (!evmWallet) {
+            return;
+        }
+        const connectorId = getConnectorId(evmWallet.connector);
+        return config._internal.connectors.setup(getCreateConnectorFn({
+            connectorId,
             handleLogOut,
             preventWagmiSyncFromCallingLogout,
-            walletConnector: wallet.connector,
+            walletConnector: evmWallet.connector,
         }));
-        return connector;
-    }), [config._internal.connectors, evmWallets, handleLogOut]);
+    }, [config._internal.connectors, getConnectorId, handleLogOut, evmWallet]);
     /**
      * Updating the wagmi config must be done in a useEffect because
      * when setting the public client and connectors, wagmi will fire

package/src/lib/hooks/useConnectorId/index.d.ts

@@ -0,0 +1 @@
+export { useConnectorId } from './useConnectorId';

package/src/lib/hooks/useConnectorId/useConnectorId.d.ts

@@ -0,0 +1,7 @@
+import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
+/**
+ * This hook is used to generate a unique ID for a given WalletConnector.
+ * This is used to ensure the wagmi connector id will change if the wallet connector
+ * instance changes between rerenders.
+ */
+export declare const useConnectorId: () => (walletConnector: WalletConnector) => string;

package/src/lib/hooks/useConnectorId/useConnectorId.js

@@ -0,0 +1,23 @@
+import { useRef, useCallback } from 'react';
+
+/**
+ * This hook is used to generate a unique ID for a given WalletConnector.
+ * This is used to ensure the wagmi connector id will change if the wallet connector
+ * instance changes between rerenders.
+ */
+const useConnectorId = () => {
+    const lastSeenWalletConnector = useRef(undefined);
+    const lastConnectorKey = useRef(0);
+    /**
+     * This function will generate a unique ID for a given WalletConnector.
+     */
+    return useCallback((walletConnector) => {
+        if (walletConnector !== lastSeenWalletConnector.current) {
+            lastSeenWalletConnector.current = walletConnector;
+            lastConnectorKey.current += 1;
+        }
+        return `dynamic-${walletConnector.key}-${lastConnectorKey.current}`;
+    }, []);
+};
+
+export { useConnectorId };

package/src/lib/hooks/useFindEvmWallet/index.d.ts

@@ -0,0 +1 @@
+export { useFindEvmWallet } from './useFindEvmWallet';

package/src/lib/hooks/useFindEvmWallet/useFindEvmWallet.d.ts

@@ -0,0 +1,2 @@
+import { Wallet } from '@dynamic-labs/sdk-react-core';
+export declare const useFindEvmWallet: (primaryWallet: Wallet | null, wallets: Wallet[]) => Wallet | undefined;

package/src/lib/hooks/useFindEvmWallet/useFindEvmWallet.js

@@ -0,0 +1,21 @@
+const isEvmWallet = (wallet) => wallet.connector.connectedChain === 'EVM';
+const isWalletConnected = (wallet) => wallet.connected;
+const useFindEvmWallet = (primaryWallet, wallets) => {
+    /**
+     * If the primary wallet is an EVM wallet and is connected, return it.
+     */
+    if (primaryWallet &&
+        isEvmWallet(primaryWallet) &&
+        isWalletConnected(primaryWallet)) {
+        return primaryWallet;
+    }
+    /**
+     * If the primary wallet is not connected, find the first connected EVM wallet.
+     */
+    const connectedEvmWallets = wallets
+        .filter(isEvmWallet)
+        .filter(isWalletConnected);
+    return connectedEvmWallets[0];
+};
+
+export { useFindEvmWallet };

package/src/lib/utils/findAndOrderEvmWallets/findAndOrderEvmWallets.d.ts

@@ -1,2 +0,0 @@
-import { Wallet } from '@dynamic-labs/sdk-react-core';
-export declare const findAndOrderEvmWallets: (primaryWallet: Wallet | null, wallets: Wallet[]) => Wallet[];

package/src/lib/utils/findAndOrderEvmWallets/findAndOrderEvmWallets.js

@@ -1,13 +0,0 @@
-const evmWalletsFilter = (wallet) => wallet.connector.connectedChain === 'EVM';
-const findAndOrderEvmWallets = (primaryWallet, wallets) => {
-    const isPrimaryWalletEvm = (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.connectedChain) === 'EVM';
-    if (isPrimaryWalletEvm) {
-        const secondaryEvmWallets = wallets
-            .filter(evmWalletsFilter)
-            .filter((wallet) => wallet.address !== primaryWallet.address);
-        return [primaryWallet, ...secondaryEvmWallets];
-    }
-    return wallets.filter(evmWalletsFilter);
-};
-
-export { findAndOrderEvmWallets };

package/src/lib/utils/findAndOrderEvmWallets/index.d.ts

@@ -1 +0,0 @@
-export { findAndOrderEvmWallets } from './findAndOrderEvmWallets';

package/src/lib/utils/index.d.ts

@@ -1 +0,0 @@
-export * from './findAndOrderEvmWallets';