@ant-design/web3-wagmi 2.1.1 → 2.2.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @ant-design/web3-wagmi
 
+## 2.2.0
+
+### Minor Changes
+
+- fe1ec95: feat: support EIP6963 wallet
+
+### Patch Changes
+
+- 1e663c3: chore: Optimize import type
+
 ## 2.1.1
 
 ### Patch Changes

package/dist/esm/interface.d.ts

@@ -8,3 +8,6 @@ export interface WalletFactory {
     connectors: Connector['name'][];
     create: (connector?: readonly Connector[]) => WalletUseInWagmiAdapter;
 }
+export type EIP6963Config = boolean | {
+    autoAddInjectedWallets?: boolean;
+};

package/dist/esm/utils.d.ts

@@ -1,3 +1,5 @@
 import debug from 'debug';
+import type { Connector as WagmiConnector } from 'wagmi';
 declare const createDebug: (namespace: string) => debug.Debugger;
-export { createDebug };
+declare const isEIP6963Connector: (connector: WagmiConnector) => boolean;
+export { createDebug, isEIP6963Connector };

package/dist/esm/utils.js

@@ -1,5 +1,12 @@
 import debug from 'debug';
+import { injected } from 'wagmi/connectors';
 var createDebug = function createDebug(namespace) {
   return debug("antd-web3:wagmi:".concat(namespace));
 };
-export { createDebug };
+var isEIP6963Connector = function isEIP6963Connector(connector) {
+  if (connector.type === injected.type && connector.icon && connector.id && connector.name) {
+    return true;
+  }
+  return false;
+};
+export { createDebug, isEIP6963Connector };

package/dist/esm/wagmi-provider/config-provider.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
 import { type Chain, type Locale } from '@ant-design/web3-common';
-import { Chain as WagmiChain } from 'viem';
+import type { Chain as WagmiChain } from 'viem';
 import { type Connector as WagmiConnector } from 'wagmi';
-import type { WalletFactory } from '../interface';
+import type { EIP6963Config, WalletFactory } from '../interface';
 export interface AntDesignWeb3ConfigProviderProps {
     chainAssets: Chain[];
     walletFactorys: WalletFactory[];
@@ -10,6 +10,7 @@ export interface AntDesignWeb3ConfigProviderProps {
     children?: React.ReactNode;
     ens?: boolean;
     balance?: boolean;
+    eip6963?: EIP6963Config;
     readonly availableChains: readonly WagmiChain[];
     readonly availableConnectors: readonly WagmiConnector[];
 }

package/dist/esm/wagmi-provider/config-provider.js

@@ -1,3 +1,7 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -11,6 +15,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React from 'react';
 import { fillAddressWith0x, Web3ConfigProvider } from '@ant-design/web3-common';
 import { useAccount, useBalance, useConfig, useConnect, useDisconnect, useSwitchChain } from 'wagmi';
+import { isEIP6963Connector } from "../utils";
+import { EIP6963Wallet } from "../wallets/eip6963";
 import { addNameToAccount, getNFTMetadata } from "./methods";
 import { jsx as _jsx } from "react/jsx-runtime";
 export var AntDesignWeb3ConfigProvider = function AntDesignWeb3ConfigProvider(props) {
@@ -22,7 +28,8 @@ export var AntDesignWeb3ConfigProvider = function AntDesignWeb3ConfigProvider(pr
     availableConnectors = props.availableConnectors,
     ens = props.ens,
     balance = props.balance,
-    locale = props.locale;
+    locale = props.locale,
+    eip6963 = props.eip6963;
   var _useAccount = useAccount(),
     address = _useAccount.address,
     isDisconnected = _useAccount.isDisconnected,
@@ -88,25 +95,44 @@ export var AntDesignWeb3ConfigProvider = function AntDesignWeb3ConfigProvider(pr
     }();
     updateAccounts();
   }, [address, isDisconnected, chain, ens]);
+  var findConnectorByName = function findConnectorByName(name) {
+    var commonConnector = availableConnectors.find(function (item) {
+      return item.name === name && !isEIP6963Connector(item);
+    });
+    if (!eip6963) {
+      return commonConnector;
+    }
+    var eip6963Connector = availableConnectors.find(function (item) {
+      return item.name === name && isEIP6963Connector(item);
+    });
+    return eip6963Connector || commonConnector;
+  };
   var wallets = React.useMemo(function () {
+    var autoAddEIP6963Wallets = [];
     availableConnectors.forEach(function (connector) {
-      // check use assets config and console.error for alert
-      var walletFactory = walletFactorys === null || walletFactorys === void 0 ? void 0 : walletFactorys.find(function (item) {
-        var _item$connectors;
-        return (_item$connectors = item.connectors) === null || _item$connectors === void 0 ? void 0 : _item$connectors.includes(connector.name);
+      if (isEIP6963Connector(connector)) {
+        // check is need auto add eip6963 wallet
+        if (_typeof(eip6963) === 'object' && eip6963 !== null && eip6963 !== void 0 && eip6963.autoAddInjectedWallets && !walletFactorys.find(function (item) {
+          return item.connectors.includes(connector.name);
+        })) {
+          // not config wallet and find the wallet in connectors, auto add it
+          autoAddEIP6963Wallets.push(EIP6963Wallet().create([connector]));
+        }
+        // Do not need check eip6963 wallet
+        return;
+      }
+      var walletFactory = walletFactorys.find(function (factory) {
+        return factory.connectors.includes(connector.name);
       });
       if (!(walletFactory !== null && walletFactory !== void 0 && walletFactory.create)) {
+        // check user wallets config and console.error for alert
         console.error("Can not find wallet factory for ".concat(connector.name, ", you should config it in WagmiWeb3ConfigProvider 'wallets'."));
       }
     });
 
     // Generate Wallet for @ant-design/web3
-    var allWallet = walletFactorys === null || walletFactorys === void 0 ? void 0 : walletFactorys.map(function (factory) {
-      var connectors = factory.connectors.map(function (name) {
-        return availableConnectors.find(function (item) {
-          return item.name === name;
-        });
-      }).filter(function (item) {
+    var supportWallets = walletFactorys.map(function (factory) {
+      var connectors = factory.connectors.map(findConnectorByName).filter(function (item) {
         return !!item;
       });
       if (connectors.length === 0) {
@@ -117,8 +143,8 @@ export var AntDesignWeb3ConfigProvider = function AntDesignWeb3ConfigProvider(pr
     }).filter(function (item) {
       return item !== null;
     });
-    return allWallet;
-  }, [availableConnectors, walletFactorys]);
+    return [].concat(_toConsumableArray(supportWallets), autoAddEIP6963Wallets);
+  }, [availableConnectors, walletFactorys, eip6963]);
   var chainList = React.useMemo(function () {
     return availableChains.map(function (item) {
       var c = chainAssets === null || chainAssets === void 0 ? void 0 : chainAssets.find(function (asset) {
@@ -183,10 +209,8 @@ export var AntDesignWeb3ConfigProvider = function AntDesignWeb3ConfigProvider(pr
               return wallet === null || wallet === void 0 || (_getWagmiConnector = (_ref3 = wallet).getWagmiConnector) === null || _getWagmiConnector === void 0 ? void 0 : _getWagmiConnector.call(_ref3);
             case 2:
               connector = _context2.sent;
-              if (!connector) {
-                connector = availableConnectors.find(function (item) {
-                  return item.name === (wallet === null || wallet === void 0 ? void 0 : wallet.name);
-                });
+              if (!connector && wallet) {
+                connector = findConnectorByName(wallet.name);
               }
               if (connector) {
                 _context2.next = 6;

package/dist/esm/wagmi-provider/index.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import type { Chain, Locale } from '@ant-design/web3-common';
 import { QueryClient } from '@tanstack/react-query';
 import type { Config } from 'wagmi';
-import type { WalletFactory } from '../interface';
+import type { EIP6963Config, WalletFactory } from '../interface';
 export type WagmiWeb3ConfigProviderProps = {
     config: Config;
     locale?: Locale;
@@ -11,5 +11,6 @@ export type WagmiWeb3ConfigProviderProps = {
     ens?: boolean;
     queryClient?: QueryClient;
     balance?: boolean;
+    eip6963?: EIP6963Config;
 };
-export declare function WagmiWeb3ConfigProvider({ children, wallets, chains, ens, locale, balance, config, queryClient, ...restProps }: React.PropsWithChildren<WagmiWeb3ConfigProviderProps>): React.ReactElement;
+export declare function WagmiWeb3ConfigProvider({ children, wallets, chains, ens, locale, balance, config, queryClient, eip6963, ...restProps }: React.PropsWithChildren<WagmiWeb3ConfigProviderProps>): React.ReactElement;

package/dist/esm/wagmi-provider/index.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["children", "wallets", "chains", "ens", "locale", "balance", "config", "queryClient"];
+var _excluded = ["children", "wallets", "chains", "ens", "locale", "balance", "config", "queryClient", "eip6963"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -31,6 +31,7 @@ export function WagmiWeb3ConfigProvider(_ref) {
     balance = _ref.balance,
     config = _ref.config,
     queryClient = _ref.queryClient,
+    eip6963 = _ref.eip6963,
     restProps = _objectWithoutProperties(_ref, _excluded);
   var chainAssets = [].concat(_toConsumableArray(chains), [Mainnet]);
   var mergedQueryClient = React.useMemo(function () {
@@ -49,6 +50,7 @@ export function WagmiWeb3ConfigProvider(_ref) {
         availableConnectors: config.connectors,
         ens: ens,
         balance: balance,
+        eip6963: eip6963,
         children: children
       })
     })

package/dist/esm/wallets/eip6963.d.ts

@@ -0,0 +1,3 @@
+import type { EthereumWallet } from '../interface';
+export declare const EIP6963_CONNECTOR = "EIP6963";
+export declare const EIP6963Wallet: EthereumWallet;

package/dist/esm/wallets/eip6963.js

@@ -0,0 +1,68 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+export var EIP6963_CONNECTOR = 'EIP6963';
+
+// EIP6963Wallet not export from @ant-design/web3-wagmi, only used in internal
+export var EIP6963Wallet = function EIP6963Wallet(metadata) {
+  return {
+    connectors: [EIP6963_CONNECTOR],
+    create: function create(connectors) {
+      var connector = connectors === null || connectors === void 0 ? void 0 : connectors[0];
+      var metadata_eip6963 = {
+        icon: connector === null || connector === void 0 ? void 0 : connector.icon,
+        name: connector.name,
+        remark: "Wallet ".concat(connector === null || connector === void 0 ? void 0 : connector.name, " detected"),
+        key: connector === null || connector === void 0 ? void 0 : connector.id
+      };
+      return _objectSpread(_objectSpread({}, metadata_eip6963), {}, {
+        hasWalletReady: function () {
+          var _hasWalletReady = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+            return _regeneratorRuntime().wrap(function _callee$(_context) {
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                  _context.next = 2;
+                  return connector === null || connector === void 0 ? void 0 : connector.getProvider();
+                case 2:
+                  return _context.abrupt("return", !!_context.sent);
+                case 3:
+                case "end":
+                  return _context.stop();
+              }
+            }, _callee);
+          }));
+          function hasWalletReady() {
+            return _hasWalletReady.apply(this, arguments);
+          }
+          return hasWalletReady;
+        }(),
+        hasExtensionInstalled: function () {
+          var _hasExtensionInstalled = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+            return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+              while (1) switch (_context2.prev = _context2.next) {
+                case 0:
+                  _context2.next = 2;
+                  return connector === null || connector === void 0 ? void 0 : connector.getProvider();
+                case 2:
+                  return _context2.abrupt("return", !!_context2.sent);
+                case 3:
+                case "end":
+                  return _context2.stop();
+              }
+            }, _callee2);
+          }));
+          function hasExtensionInstalled() {
+            return _hasExtensionInstalled.apply(this, arguments);
+          }
+          return hasExtensionInstalled;
+        }()
+      }, metadata);
+    }
+  };
+};

package/dist/esm/wallets/okx-wallet.d.ts

@@ -1,2 +1,2 @@
-import { EthereumWallet } from '../interface';
+import type { EthereumWallet } from '../interface';
 export declare const OkxWallet: EthereumWallet;

package/dist/esm/wallets/token-pocket.d.ts

@@ -1,2 +1,2 @@
-import { EthereumWallet } from '../interface';
+import type { EthereumWallet } from '../interface';
 export declare const TokenPocket: EthereumWallet;

package/dist/esm/wallets/wallet-connect.d.ts

@@ -1,4 +1,4 @@
-import { WalletMetadata } from '@ant-design/web3-common';
+import type { WalletMetadata } from '@ant-design/web3-common';
 import type { WalletFactory } from '../interface';
 type EthereumWalletConnect = (metadata?: Partial<WalletMetadata> & {
     useWalletConnectOfficialModal?: boolean;

package/dist/lib/interface.d.ts

@@ -8,3 +8,6 @@ export interface WalletFactory {
     connectors: Connector['name'][];
     create: (connector?: readonly Connector[]) => WalletUseInWagmiAdapter;
 }
+export type EIP6963Config = boolean | {
+    autoAddInjectedWallets?: boolean;
+};

package/dist/lib/utils.d.ts

@@ -1,3 +1,5 @@
 import debug from 'debug';
+import type { Connector as WagmiConnector } from 'wagmi';
 declare const createDebug: (namespace: string) => debug.Debugger;
-export { createDebug };
+declare const isEIP6963Connector: (connector: WagmiConnector) => boolean;
+export { createDebug, isEIP6963Connector };

package/dist/lib/utils.js

@@ -3,10 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createDebug = void 0;
+exports.isEIP6963Connector = exports.createDebug = void 0;
 var _debug = _interopRequireDefault(require("debug"));
+var _connectors = require("wagmi/connectors");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const createDebug = namespace => {
   return (0, _debug.default)(`antd-web3:wagmi:${namespace}`);
 };
-exports.createDebug = createDebug;
+exports.createDebug = createDebug;
+const isEIP6963Connector = connector => {
+  if (connector.type === _connectors.injected.type && connector.icon && connector.id && connector.name) {
+    return true;
+  }
+  return false;
+};
+exports.isEIP6963Connector = isEIP6963Connector;

package/dist/lib/wagmi-provider/config-provider.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
 import { type Chain, type Locale } from '@ant-design/web3-common';
-import { Chain as WagmiChain } from 'viem';
+import type { Chain as WagmiChain } from 'viem';
 import { type Connector as WagmiConnector } from 'wagmi';
-import type { WalletFactory } from '../interface';
+import type { EIP6963Config, WalletFactory } from '../interface';
 export interface AntDesignWeb3ConfigProviderProps {
     chainAssets: Chain[];
     walletFactorys: WalletFactory[];
@@ -10,6 +10,7 @@ export interface AntDesignWeb3ConfigProviderProps {
     children?: React.ReactNode;
     ens?: boolean;
     balance?: boolean;
+    eip6963?: EIP6963Config;
     readonly availableChains: readonly WagmiChain[];
     readonly availableConnectors: readonly WagmiConnector[];
 }

package/dist/lib/wagmi-provider/config-provider.js

@@ -7,6 +7,8 @@ exports.AntDesignWeb3ConfigProvider = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _web3Common = require("@ant-design/web3-common");
 var _wagmi = require("wagmi");
+var _utils = require("../utils");
+var _eip = require("../wallets/eip6963");
 var _methods = require("./methods");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -19,7 +21,8 @@ const AntDesignWeb3ConfigProvider = props => {
     availableConnectors,
     ens,
     balance,
-    locale
+    locale,
+    eip6963
   } = props;
   const {
     address,
@@ -56,26 +59,44 @@ const AntDesignWeb3ConfigProvider = props => {
     };
     updateAccounts();
   }, [address, isDisconnected, chain, ens]);
+  const findConnectorByName = name => {
+    const commonConnector = availableConnectors.find(item => item.name === name && !(0, _utils.isEIP6963Connector)(item));
+    if (!eip6963) {
+      return commonConnector;
+    }
+    const eip6963Connector = availableConnectors.find(item => item.name === name && (0, _utils.isEIP6963Connector)(item));
+    return eip6963Connector || commonConnector;
+  };
   const wallets = _react.default.useMemo(() => {
+    const autoAddEIP6963Wallets = [];
     availableConnectors.forEach(connector => {
-      // check use assets config and console.error for alert
-      const walletFactory = walletFactorys?.find(item => item.connectors?.includes(connector.name));
+      if ((0, _utils.isEIP6963Connector)(connector)) {
+        // check is need auto add eip6963 wallet
+        if (typeof eip6963 === 'object' && eip6963?.autoAddInjectedWallets && !walletFactorys.find(item => item.connectors.includes(connector.name))) {
+          // not config wallet and find the wallet in connectors, auto add it
+          autoAddEIP6963Wallets.push((0, _eip.EIP6963Wallet)().create([connector]));
+        }
+        // Do not need check eip6963 wallet
+        return;
+      }
+      const walletFactory = walletFactorys.find(factory => factory.connectors.includes(connector.name));
       if (!walletFactory?.create) {
+        // check user wallets config and console.error for alert
         console.error(`Can not find wallet factory for ${connector.name}, you should config it in WagmiWeb3ConfigProvider 'wallets'.`);
       }
     });
 
     // Generate Wallet for @ant-design/web3
-    const allWallet = walletFactorys?.map(factory => {
-      const connectors = factory.connectors.map(name => availableConnectors.find(item => item.name === name)).filter(item => !!item);
+    const supportWallets = walletFactorys.map(factory => {
+      const connectors = factory.connectors.map(findConnectorByName).filter(item => !!item);
       if (connectors.length === 0) {
         // Not config connector for this wallet factory, ignore it.
         return null;
       }
       return factory.create(connectors);
     }).filter(item => item !== null);
-    return allWallet;
-  }, [availableConnectors, walletFactorys]);
+    return [...supportWallets, ...autoAddEIP6963Wallets];
+  }, [availableConnectors, walletFactorys, eip6963]);
   const chainList = _react.default.useMemo(() => {
     return availableChains.map(item => {
       const c = chainAssets?.find(asset => {
@@ -126,8 +147,8 @@ const AntDesignWeb3ConfigProvider = props => {
     availableWallets: wallets,
     connect: async wallet => {
       let connector = await wallet?.getWagmiConnector?.();
-      if (!connector) {
-        connector = availableConnectors.find(item => item.name === wallet?.name);
+      if (!connector && wallet) {
+        connector = findConnectorByName(wallet.name);
       }
       if (!connector) {
         throw new Error(`Can not find connector for ${wallet?.name}`);

package/dist/lib/wagmi-provider/index.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import type { Chain, Locale } from '@ant-design/web3-common';
 import { QueryClient } from '@tanstack/react-query';
 import type { Config } from 'wagmi';
-import type { WalletFactory } from '../interface';
+import type { EIP6963Config, WalletFactory } from '../interface';
 export type WagmiWeb3ConfigProviderProps = {
     config: Config;
     locale?: Locale;
@@ -11,5 +11,6 @@ export type WagmiWeb3ConfigProviderProps = {
     ens?: boolean;
     queryClient?: QueryClient;
     balance?: boolean;
+    eip6963?: EIP6963Config;
 };
-export declare function WagmiWeb3ConfigProvider({ children, wallets, chains, ens, locale, balance, config, queryClient, ...restProps }: React.PropsWithChildren<WagmiWeb3ConfigProviderProps>): React.ReactElement;
+export declare function WagmiWeb3ConfigProvider({ children, wallets, chains, ens, locale, balance, config, queryClient, eip6963, ...restProps }: React.PropsWithChildren<WagmiWeb3ConfigProviderProps>): React.ReactElement;

package/dist/lib/wagmi-provider/index.js

@@ -22,6 +22,7 @@ function WagmiWeb3ConfigProvider({
   balance,
   config,
   queryClient,
+  eip6963,
   ...restProps
 }) {
   const chainAssets = [...chains, _web3Assets.Mainnet];
@@ -41,6 +42,7 @@ function WagmiWeb3ConfigProvider({
         availableConnectors: config.connectors,
         ens: ens,
         balance: balance,
+        eip6963: eip6963,
         children: children
       })
     })

package/dist/lib/wallets/eip6963.d.ts

@@ -0,0 +1,3 @@
+import type { EthereumWallet } from '../interface';
+export declare const EIP6963_CONNECTOR = "EIP6963";
+export declare const EIP6963Wallet: EthereumWallet;

package/dist/lib/wallets/eip6963.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.EIP6963_CONNECTOR = exports.EIP6963Wallet = void 0;
+const EIP6963_CONNECTOR = exports.EIP6963_CONNECTOR = 'EIP6963';
+
+// EIP6963Wallet not export from @ant-design/web3-wagmi, only used in internal
+const EIP6963Wallet = metadata => {
+  return {
+    connectors: [EIP6963_CONNECTOR],
+    create: connectors => {
+      const connector = connectors?.[0];
+      const metadata_eip6963 = {
+        icon: connector?.icon,
+        name: connector.name,
+        remark: `Wallet ${connector?.name} detected`,
+        key: connector?.id
+      };
+      return {
+        ...metadata_eip6963,
+        hasWalletReady: async () => {
+          return !!(await connector?.getProvider());
+        },
+        hasExtensionInstalled: async () => {
+          return !!(await connector?.getProvider());
+        },
+        ...metadata
+      };
+    }
+  };
+};
+exports.EIP6963Wallet = EIP6963Wallet;

package/dist/lib/wallets/okx-wallet.d.ts

@@ -1,2 +1,2 @@
-import { EthereumWallet } from '../interface';
+import type { EthereumWallet } from '../interface';
 export declare const OkxWallet: EthereumWallet;

package/dist/lib/wallets/token-pocket.d.ts

@@ -1,2 +1,2 @@
-import { EthereumWallet } from '../interface';
+import type { EthereumWallet } from '../interface';
 export declare const TokenPocket: EthereumWallet;

package/dist/lib/wallets/wallet-connect.d.ts

@@ -1,4 +1,4 @@
-import { WalletMetadata } from '@ant-design/web3-common';
+import type { WalletMetadata } from '@ant-design/web3-common';
 import type { WalletFactory } from '../interface';
 type EthereumWalletConnect = (metadata?: Partial<WalletMetadata> & {
     useWalletConnectOfficialModal?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ant-design/web3-wagmi",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "main": "dist/lib/index.js",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",