Merge pull request #205 from lidofinance/feature/si-1729-support-ambi…

…re-extension Support ambire extension
lidofinance · Dec 13, 2024 · 6bbf93d · 6bbf93d
2 parents 1add0ff + fe5d324
commit 6bbf93d
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 23 deletions.
diff --git a/apps/demo-react/components/wallet-info/wallet-info-content.tsx b/apps/demo-react/components/wallet-info/wallet-info-content.tsx
@@ -1,8 +1,9 @@
 import React from 'react';
+import { useAccount } from 'wagmi';
+import { useCapabilities } from 'wagmi/experimental';
 import { Close } from '@lidofinance/lido-ui';
 import { useWeb3, useSupportedChains } from 'reef-knot/web3-react';
 import { useConnectorInfo } from 'reef-knot/core-react';
-import { useAccount } from 'wagmi';
 
 import {
   HeadingStyle,
@@ -22,6 +23,7 @@ export const WalletInfoContent = ({
   const { setIsWalletInfoIsOpen } = useClientConfig();
   const connectorInfo = useConnectorInfo();
   const supportedChainsData = useSupportedChains();
+  const capabilities = useCapabilities();
   const { isUnsupported } = supportedChainsData;
   const supportedChainIds = supportedChainsData.supportedChains.map(
     (c) => c.chainId,
@@ -98,6 +100,29 @@ export const WalletInfoContent = ({
         </code>
       </div>
 
+      <HeadingStyle>EIP-5792 Capabilities</HeadingStyle>
+      <div>
+        <code>
+          <DataTableRowStyle title="loading">
+            {String(capabilities.isLoading)}
+          </DataTableRowStyle>
+          <DataTableRowStyle title="error">
+            {capabilities.error?.message ?? '-'}
+          </DataTableRowStyle>
+          {capabilities.data &&
+            Object.entries(capabilities.data)
+              .filter(([chain]) => supportedChainIds.includes(Number(chain)))
+              .map(([chain, enabledCapabilties]) => (
+                <DataTableRowStyle key="chain" title={chain} highlight>
+                  {Object.entries(enabledCapabilties)
+                    .filter(([, capability]) => capability.supported)
+                    .map(([capabilityTitle]) => capabilityTitle)
+                    .join(',')}
+                </DataTableRowStyle>
+              ))}
+        </code>
+      </div>
+
       <ChainsConfig />
 
       {children}

diff --git a/packages/reef-knot/CHANGELOG.md b/packages/reef-knot/CHANGELOG.md
@@ -1,5 +1,11 @@
 # reef-knot
 
+## 7.1.1
+
+### Patch Changes
+
+- @reef-knot/wallets-list@4.1.1
+
 ## 7.1.0
 
 ### Minor Changes

diff --git a/packages/reef-knot/package.json b/packages/reef-knot/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reef-knot",
-  "version": "7.1.0",
+  "version": "7.1.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
@@ -45,7 +45,7 @@
     "@reef-knot/core-react": "6.0.0",
     "@reef-knot/web3-react": "6.0.0",
     "@reef-knot/ui-react": "2.1.5",
-    "@reef-knot/wallets-list": "4.1.0",
+    "@reef-knot/wallets-list": "4.1.1",
     "@reef-knot/wallets-helpers": "2.1.1",
     "@reef-knot/types": "4.0.0",
     "@reef-knot/ledger-connector": "4.2.0"

diff --git a/packages/wallets-list/CHANGELOG.md b/packages/wallets-list/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @reef-knot/wallets-list
 
+## 4.1.1
+
+### Patch Changes
+
+- Updated dependencies [c5965d1]
+  - @reef-knot/wallet-adapter-ambire@5.0.0
+
 ## 4.1.0
 
 ### Minor Changes

diff --git a/packages/wallets-list/package.json b/packages/wallets-list/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@reef-knot/wallets-list",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
@@ -42,7 +42,7 @@
     "@reef-knot/wallet-adapter-okx": "4.0.0",
     "@reef-knot/wallet-adapter-exodus": "4.0.0",
     "@reef-knot/wallet-adapter-walletconnect": "4.0.0",
-    "@reef-knot/wallet-adapter-ambire": "4.0.0",
+    "@reef-knot/wallet-adapter-ambire": "5.0.0",
     "@reef-knot/wallet-adapter-binance-wallet": "3.0.0",
     "@reef-knot/wallet-adapter-bitkeep": "4.0.0",
     "@reef-knot/wallet-adapter-coin98": "4.0.0",

diff --git a/packages/wallets/ambire/CHANGELOG.md b/packages/wallets/ambire/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @reef-knot/wallet-adapter-ambire
 
+## 5.0.0
+
+### Major Changes
+
+- c5965d1: Migrate Ambire Wallet Connector to extension
+
 ## 4.0.0
 
 ### Patch Changes

diff --git a/packages/wallets/ambire/package.json b/packages/wallets/ambire/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@reef-knot/wallet-adapter-ambire",
-  "version": "4.0.0",
+  "version": "5.0.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {

diff --git a/packages/wallets/ambire/src/index.ts b/packages/wallets/ambire/src/index.ts
@@ -1,27 +1,25 @@
-import { WalletAdapterType } from '@reef-knot/types';
-import { getWalletConnectConnector } from '@reef-knot/wallets-helpers';
+import { injected } from 'wagmi/connectors';
+import type { WalletAdapterType } from '@reef-knot/types';
+import {
+  getTargetEIP6963,
+  isProviderExistsEIP6963,
+} from '@reef-knot/wallets-helpers';
 import WalletIcon from './icons/ambire.svg';
 
 export const id = 'ambire';
 export const name = 'Ambire';
+export const rdns = 'com.ambire.wallet';
 
-export const Ambire: WalletAdapterType = ({ walletconnectProjectId }) => ({
+export const Ambire: WalletAdapterType = ({ providersStore }) => ({
   walletName: name,
   walletId: id,
-  type: getWalletConnectConnector.type,
+  type: injected.type,
   icon: WalletIcon,
-  createConnectorFn: getWalletConnectConnector({
-    projectId: walletconnectProjectId,
-  }),
-  walletconnectExtras: {
-    connectionViaURI: {
-      createConnectorFn: getWalletConnectConnector({
-        qrcode: false,
-        projectId: walletconnectProjectId,
-      }),
-      condition: true, // Actually, Ambire will always use this connector
-      redirectLink: 'https://wallet.ambire.com/?uri=',
-      closeRedirectionWindow: false,
-    },
+  detector: () => isProviderExistsEIP6963(providersStore, rdns),
+  downloadURLs: {
+    default: 'https://www.ambire.com/',
   },
+  createConnectorFn: injected({
+    target: () => getTargetEIP6963(providersStore, rdns),
+  }),
 });