Update libraries, rework WC URI connection, update ZenGo logo

.changeset/cold-eagles-cross.md

@@ -0,0 +1,5 @@
+---
+'@reef-knot/wallet-adapter-zengo': patch
+---
+
+Update ZenGo logo, wagmi 0.12.18

.changeset/config.json

@@ -1,11 +1,14 @@
 {
-  "$schema": "https://unpkg.com/@changesets/config@2.2.0/schema.json",
+  "$schema": "https://unpkg.com/@changesets/config@2.3.1/schema.json",
   "changelog": "@changesets/cli/changelog",
   "commit": false,
   "fixed": [],
   "linked": [],
-  "access": "restricted",
+  "access": "public",
   "baseBranch": "main",
   "updateInternalDependencies": "patch",
-  "ignore": []
+  "ignore": [],
+  "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
+    "onlyUpdatePeerDependentsWhenOutOfRange": true
+  }
 }

.changeset/nice-waves-bake.md

@@ -0,0 +1,10 @@
+---
+'@reef-knot/connect-wallet-modal': patch
+'@reef-knot/wallets-helpers': patch
+'@reef-knot/core-react': patch
+'@reef-knot/web3-react': patch
+'@reef-knot/ui-react': patch
+'@reef-knot/types': patch
+---
+
+wagmi 0.12.18

.changeset/rotten-drinks-hear.md

@@ -0,0 +1,5 @@
+---
+'@reef-knot/web3-react': patch
+---
+
+Update lido-sdk packages

.changeset/shy-bugs-live.md

@@ -0,0 +1,11 @@
+---
+'@reef-knot/wallet-adapter-blockchaincom': patch
+'@reef-knot/wallet-adapter-walletconnect': patch
+'@reef-knot/wallet-adapter-ambire': patch
+'@reef-knot/wallet-adapter-exodus': patch
+'@reef-knot/wallet-adapter-zerion': patch
+'@reef-knot/wallet-adapter-taho': patch
+'@reef-knot/wallet-adapter-okx': patch
+---
+
+wagmi 0.12.18

.changeset/smart-tomatoes-sing.md

@@ -0,0 +1,6 @@
+---
+'@reef-knot/connect-wallet-modal': patch
+'@reef-knot/wallets-helpers': patch
+---
+
+Rework and fix WalletConnect connection via pairing URI

.changeset/warm-hounds-sin.md

@@ -0,0 +1,5 @@
+---
+'@reef-knot/wallet-adapter-phantom': patch
+---
+
+wagmi 0.12.18

apps/demo-react/package.json

@@ -18,7 +18,7 @@
     "react-dom": "17.0.2",
     "reef-knot": "*",
     "styled-components": "^5.3.6",
-    "wagmi": "^0.12.17"
+    "wagmi": "^0.12.18"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0",

package.json

@@ -21,7 +21,7 @@
     "release": "changeset publish"
   },
   "devDependencies": {
-    "@changesets/cli": "^2.25.0",
+    "@changesets/cli": "^2.26.2",
     "@lidofinance/eslint-config": "0.0.2",
     "@next/eslint-plugin-next": "12.1.6",
     "@rollup/plugin-babel": "5.3.1",
@@ -54,14 +54,12 @@
     "rollup-plugin-svg-import": "1.6.0",
     "rollup-plugin-typescript2": "0.34.1",
     "tslib": "2.5.0",
-    "turbo": "^1.9.6",
+    "turbo": "^1.10.7",
     "typescript": "^4.9.5"
   },
   "dependencies": {},
   "resolutions": {
-    "@types/react": "17.0.53",
-    "@walletconnect/core": "^2.8.3",
-    "@walletconnect/ethereum-provider": "^2.8.3"
+    "@types/react": "17.0.53"
   },
   "engines": {
     "node": ">=16.0.0"

packages/connect-wallet-modal/package.json

@@ -45,21 +45,23 @@
     "@reef-knot/types": "^1.2.1",
     "@reef-knot/ui-react": "^1.0.4",
     "@reef-knot/wallets-icons": "^1.0.0",
+    "@reef-knot/wallets-helpers": "^1.1.2",
     "@reef-knot/web3-react": "^1.3.0",
     "@types/ua-parser-js": "^0.7.36",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "ua-parser-js": "1.0.33",
-    "wagmi": "^0.12.17"
+    "wagmi": "^0.12.18"
   },
   "peerDependencies": {
     "@reef-knot/core-react": "^1.4.2",
     "@reef-knot/types": "^1.2.1",
     "@reef-knot/ui-react": "^1.0.4",
     "@reef-knot/wallets-icons": "^1.0.0",
+    "@reef-knot/wallets-helpers": "^1.1.2",
     "@reef-knot/web3-react": "^1.3.0",
     "react": ">=17",
     "ua-parser-js": "^1.0.33",
-    "wagmi": "^0.12.17"
+    "wagmi": "^0.12.18"
   }
 }

packages/connect-wallet-modal/src/connectButtons/ConnectWC.tsx

@@ -1,7 +1,8 @@
-import React, { FC, useCallback, useEffect, useState } from 'react';
+import React, { FC, useCallback, useState } from 'react';
 import { useConnect } from 'wagmi';
 import { useDisconnect } from '@reef-knot/web3-react';
 import { WCWarnBannerRequest } from '@reef-knot/ui-react';
+import { getWalletConnectUri } from '@reef-knot/wallets-helpers';
 import { ConnectButton } from '../components/ConnectButton';
 import { capitalize } from '../helpers';
 import { ConnectWCProps } from './types';
@@ -42,30 +43,6 @@ export const ConnectWC: FC<ConnectWCProps> = (props: ConnectWCProps) => {
   const metricsOnClick =
     metrics?.events?.click?.handlers[`onClick${walletIdCapitalized}`];
 
-  const WCURIConnector = walletconnectExtras?.connectionViaURI?.connector;
-  const WCURICondition = walletconnectExtras?.connectionViaURI?.condition;
-  const WCURIRedirectLink = walletconnectExtras?.connectionViaURI?.redirectLink;
-  const WCURICloseRedirectionWindow =
-    walletconnectExtras?.connectionViaURI?.closeRedirectionWindow ?? true;
-
-  useEffect(() => {
-    // BEGIN Handle WalletConnect v2 redirection (connection without QR modal)
-    const redirect = (uri: string) => {
-      if (WCURIRedirectLink)
-        setRedirectionWindowLocation(WCURIRedirectLink, uri);
-    };
-    let provider: any;
-    (async () => {
-      provider = await WCURIConnector?.getProvider();
-      provider?.on('display_uri', redirect);
-    })();
-    // END Handle WalletConnect v2 redirection (connection without QR modal)
-
-    return () => {
-      provider?.off('display_uri', redirect);
-    };
-  }, [WCURICondition, WCURIConnector, WCURIRedirectLink]);
-
   const { connectAsync } = useConnect({
     onSuccess() {
       onConnect?.();
@@ -77,36 +54,58 @@ export const ConnectWC: FC<ConnectWCProps> = (props: ConnectWCProps) => {
   const [isConnecting, setIsConnecting] = useState(false);
 
   const handleConnect = useCallback(async () => {
+    // WCURI – WalletConnect Pairing URI: https://docs.walletconnect.com/2.0/specs/clients/core/pairing/pairing-uri
+    // Used for connection without WalletConnect QR modal via redirect
+    const WCURIConnector = walletconnectExtras?.connectionViaURI?.connector;
+    const WCURICondition = walletconnectExtras?.connectionViaURI?.condition;
+    const WCURIRedirectLink =
+      walletconnectExtras?.connectionViaURI?.redirectLink;
+    const WCURICloseRedirectionWindow =
+      walletconnectExtras?.connectionViaURI?.closeRedirectionWindow ?? true;
+
     setIsConnecting(true);
+
     try {
       onBeforeConnect?.();
       metricsOnClick?.();
 
       disconnect?.();
 
-      if (WCURICondition) {
-        // because of popup blockers, window.open must be called directly from onclick handler
+      if (WCURICondition && WCURIConnector && WCURIRedirectLink) {
+        // BEGIN Handle connection via redirect using WC Pairing URI (without WalletConnect QR modal)
+        // Because of popup blockers, window.open must be called directly from onclick handler
         redirectionWindow = window.open('', '_blank');
         redirectionWindow?.document.write(getRedirectionLoadingHTML());
-        await connectAsync({ connector: WCURIConnector });
-        if (WCURICloseRedirectionWindow) {
-          redirectionWindow?.close();
-        }
+
+        // Initiate a connection, but do not block the further execution
+        connectAsync({ connector: WCURIConnector }).then(() => {
+          // We got a connection result
+          if (WCURICloseRedirectionWindow) {
+            // Close the previously opened window if necessary
+            redirectionWindow?.close();
+          }
+        });
+
+        // Wait for WalletConnect Pairing URI to arrive
+        const wcUri = await getWalletConnectUri(WCURIConnector);
+        setRedirectionWindowLocation(WCURIRedirectLink, wcUri);
+        // END Handle connection via redirect using WC Pairing URI (without WalletConnect QR modal)
       } else {
         await connectAsync({ connector });
       }
     } finally {
       setIsConnecting(false);
     }
   }, [
-    WCURICloseRedirectionWindow,
-    WCURICondition,
-    WCURIConnector,
     connectAsync,
     connector,
     disconnect,
     metricsOnClick,
     onBeforeConnect,
+    walletconnectExtras?.connectionViaURI?.closeRedirectionWindow,
+    walletconnectExtras?.connectionViaURI?.condition,
+    walletconnectExtras?.connectionViaURI?.connector,
+    walletconnectExtras?.connectionViaURI?.redirectLink,
   ]);
 
   const WalletIcon = icon || icons;

packages/core-react/package.json

@@ -38,14 +38,14 @@
   },
   "devDependencies": {
     "react": "17.0.2",
-    "wagmi": "^0.12.17",
+    "wagmi": "^0.12.18",
     "@reef-knot/wallets-list": "^1.4.1",
     "@reef-knot/types": "^1.2.1",
     "@reef-knot/ui-react": "^1.0.4"
   },
   "peerDependencies": {
     "react": ">=17",
-    "wagmi": "^0.12.17",
+    "wagmi": "^0.12.18",
     "@reef-knot/wallets-list": "^1.4.1",
     "@reef-knot/types": "^1.2.1",
     "@reef-knot/ui-react": "^1.0.4"

packages/types/package.json

@@ -27,10 +27,10 @@
   },
   "devDependencies": {
     "react": "17.0.2",
-    "wagmi": "^0.12.17"
+    "wagmi": "^0.12.18"
   },
   "peerDependencies": {
     "react": ">=17",
-    "wagmi": "^0.12.17"
+    "wagmi": "^0.12.18"
   }
 }

packages/ui-react/package.json

@@ -49,14 +49,14 @@
     "react-dom": ">=17",
     "react-is": ">=17",
     "styled-components": "5",
-    "wagmi": "^0.12.17"
+    "wagmi": "^0.12.18"
   },
   "devDependencies": {
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-is": "17.0.2",
     "styled-components": "^5.3.6",
     "@types/react-transition-group": "4.4.2",
-    "wagmi": "^0.12.17"
+    "wagmi": "^0.12.18"
   }
 }

packages/wallets-helpers/package.json

@@ -37,12 +37,12 @@
     "lint": "eslint"
   },
   "devDependencies": {
-    "wagmi": "^0.12.17",
+    "wagmi": "^0.12.18",
     "ua-parser-js": "1.0.33"
   },
   "peerDependencies": {
     "react": ">=17",
-    "wagmi": "^0.12.17",
+    "wagmi": "^0.12.18",
     "ua-parser-js": "1.0.33"
   }
 }

packages/wallets-helpers/src/index.ts

@@ -1,2 +1,2 @@
-export * from './factories';
+export * from './walletconnect';
 export * from './utils';

packages/wallets-helpers/src/factories/walletConnectConnector.ts → packages/wallets-helpers/src/walletconnect/getWalletConnectConnector.ts

@@ -13,6 +13,12 @@ export const getWalletConnectConnector = ({
   qrcode?: boolean;
   chains: Chain[];
 }) => {
+  if (!projectId) {
+    throw new Error(
+      'No WalletConnect Project ID found, it is required by WalletConnect v2: https://docs.walletconnect.com/2.0/cloud/relay#project-id',
+    );
+  }
+
   const params = {
     chains,
     options: {

packages/wallets-helpers/src/walletconnect/getWalletConnectUri.ts

@@ -0,0 +1,8 @@
+import type { Connector } from 'wagmi/connectors';
+
+export const getWalletConnectUri = async (connector: Connector) => {
+  const provider = await connector.getProvider();
+  return new Promise<string>((resolve) => {
+    provider.once('display_uri', resolve);
+  });
+};

packages/wallets-helpers/src/walletconnect/index.ts

@@ -0,0 +1,2 @@
+export * from './getWalletConnectConnector';
+export * from './getWalletConnectUri';

packages/wallets/ambire/package.json

@@ -37,7 +37,7 @@
     "@svgr/rollup": "^6.5.1"
   },
   "peerDependencies": {
-    "wagmi": "^0.12.17",
+    "wagmi": "^0.12.18",
     "@reef-knot/wallets-helpers": "^1.1.2",
     "@reef-knot/types": "^1.2.1"
   }

packages/wallets/blockchaincom/package.json

@@ -37,7 +37,7 @@
     "@svgr/rollup": "^6.5.1"
   },
   "peerDependencies": {
-    "wagmi": "^0.12.17",
+    "wagmi": "^0.12.18",
     "@reef-knot/wallets-helpers": "^1.1.2",
     "@reef-knot/types": "^1.2.1"
   }

packages/wallets/exodus/package.json

@@ -36,7 +36,7 @@
     "@svgr/rollup": "^6.5.1"
   },
   "peerDependencies": {
-    "wagmi": "^0.12.17",
+    "wagmi": "^0.12.18",
     "@reef-knot/types": "^1.2.1"
   }
 }

packages/wallets/okx/package.json

@@ -36,7 +36,7 @@
     "@svgr/rollup": "^6.5.1"
   },
   "peerDependencies": {
-    "wagmi": "^0.12.17",
+    "wagmi": "^0.12.18",
     "@reef-knot/types": "^1.2.1"
   }
 }

packages/wallets/phantom/package.json

@@ -36,7 +36,7 @@
     "@svgr/rollup": "^6.5.1"
   },
   "peerDependencies": {
-    "wagmi": "^0.12.17",
+    "wagmi": "^0.12.18",
     "@reef-knot/types": "^1.2.1"
   }
 }

packages/wallets/taho/package.json

@@ -36,7 +36,7 @@
     "@svgr/rollup": "^6.5.1"
   },
   "peerDependencies": {
-    "wagmi": "^0.12.17",
+    "wagmi": "^0.12.18",
     "@reef-knot/types": "^1.2.1"
   }
 }

packages/wallets/walletconnect/package.json

@@ -37,7 +37,7 @@
     "@svgr/rollup": "^6.5.1"
   },
   "peerDependencies": {
-    "wagmi": "^0.12.17",
+    "wagmi": "^0.12.18",
     "@reef-knot/wallets-helpers": "^1.1.2",
     "@reef-knot/types": "^1.2.1"
   }