@ant-design/web3-wagmi 2.4.3 → 2.4.5

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @ant-design/web3-wagmi
 
+## 2.4.5
+
+### Patch Changes
+
+- 518fd83: fix(wagmi): react max depth update exceeded
+- 518fd83: chore: add storage props to config
+- Updated dependencies [dd6366c]
+  - @ant-design/web3-common@1.10.0
+  - @ant-design/web3-assets@1.7.2
+
+## 2.4.4
+
+### Patch Changes
+
+- 1270c95: chore(ethers): adjusted the compatibility form of the old version of etherjs
+- 02e74aa: fix: set sideEffects false for enable treeshaking
+- Updated dependencies [02e74aa]
+  - @ant-design/web3-assets@1.7.1
+  - @ant-design/web3-common@1.9.1
+
 ## 2.4.3
 
 ### Patch Changes

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

@@ -14,12 +14,14 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 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 { disconnect, getAccount } from '@wagmi/core';
+import { useAccount, useBalance, useConfig, useConnect, 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) {
+  var _availableChains$, _availableChains$2;
   var children = props.children,
     chainAssets = props.chainAssets,
     walletFactorys = props.walletFactorys,
@@ -42,12 +44,6 @@ export var AntDesignWeb3ConfigProvider = function AntDesignWeb3ConfigProvider(pr
     connectAsync = _useConnect.connectAsync;
   var _useSwitchChain = useSwitchChain(),
     switchChain = _useSwitchChain.switchChain;
-  var _useDisconnect = useDisconnect(),
-    disconnectAsync = _useDisconnect.disconnectAsync;
-  var _React$useState3 = React.useState(undefined),
-    _React$useState4 = _slicedToArray(_React$useState3, 2),
-    currentChain = _React$useState4[0],
-    setCurrentChain = _React$useState4[1];
   var _useBalance = useBalance({
       address: balance && account ? fillAddressWith0x(account.address) : undefined
     }),
@@ -55,39 +51,39 @@ export var AntDesignWeb3ConfigProvider = function AntDesignWeb3ConfigProvider(pr
   React.useEffect(function () {
     if (!address || isDisconnected) {
       setAccount(undefined);
-      return;
+    } else {
+      var updateAccounts = /*#__PURE__*/function () {
+        var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+          var a;
+          return _regeneratorRuntime().wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                a = {
+                  address: address
+                };
+                setAccount(a);
+                if (!ens) {
+                  _context.next = 8;
+                  break;
+                }
+                _context.t0 = setAccount;
+                _context.next = 6;
+                return addNameToAccount(config, a);
+              case 6:
+                _context.t1 = _context.sent;
+                (0, _context.t0)(_context.t1);
+              case 8:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee);
+        }));
+        return function updateAccounts() {
+          return _ref.apply(this, arguments);
+        };
+      }();
+      updateAccounts();
     }
-    var updateAccounts = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var a;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              a = {
-                address: address
-              };
-              setAccount(a);
-              if (!ens) {
-                _context.next = 8;
-                break;
-              }
-              _context.t0 = setAccount;
-              _context.next = 6;
-              return addNameToAccount(config, a);
-            case 6:
-              _context.t1 = _context.sent;
-              (0, _context.t0)(_context.t1);
-            case 8:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee);
-      }));
-      return function updateAccounts() {
-        return _ref.apply(this, arguments);
-      };
-    }();
-    updateAccounts();
   }, [address, isDisconnected, chain, ens]);
   var findConnectorByName = function findConnectorByName(name) {
     var commonConnector = availableConnectors.find(function (item) {
@@ -158,28 +154,27 @@ export var AntDesignWeb3ConfigProvider = function AntDesignWeb3ConfigProvider(pr
       return item !== null;
     });
   }, [availableChains, chainAssets]);
+  var chainId = (chain === null || chain === void 0 ? void 0 : chain.id) || (availableChains === null || availableChains === void 0 || (_availableChains$ = availableChains[0]) === null || _availableChains$ === void 0 ? void 0 : _availableChains$.id);
+  var chainName = (chain === null || chain === void 0 ? void 0 : chain.name) || (availableChains === null || availableChains === void 0 || (_availableChains$2 = availableChains[0]) === null || _availableChains$2 === void 0 ? void 0 : _availableChains$2.name);
+  var _React$useState3 = React.useState(undefined),
+    _React$useState4 = _slicedToArray(_React$useState3, 2),
+    currentChain = _React$useState4[0],
+    setCurrentChain = _React$useState4[1];
   React.useEffect(function () {
-    var _c;
-    if (!chain && currentChain) {
+    setCurrentChain(function (prevChain) {
       // not connected any chain, keep current chain
-      return;
-    }
-    var currentWagmiChain = chain !== null && chain !== void 0 ? chain : availableChains[0];
-    if (!currentWagmiChain) {
-      return;
-    }
-    var c = chainAssets === null || chainAssets === void 0 ? void 0 : chainAssets.find(function (item) {
-      return item.id === (currentWagmiChain === null || currentWagmiChain === void 0 ? void 0 : currentWagmiChain.id);
+      var newChain = chainAssets === null || chainAssets === void 0 ? void 0 : chainAssets.find(function (item) {
+        return (item === null || item === void 0 ? void 0 : item.id) === chainId;
+      });
+      if (!newChain && chainId) {
+        newChain = {
+          id: chainId,
+          name: chainName
+        };
+      }
+      return newChain || prevChain;
     });
-    if (!((_c = c) !== null && _c !== void 0 && _c.id)) {
-      c = {
-        id: currentWagmiChain.id,
-        name: currentWagmiChain.name
-      };
-    }
-    setCurrentChain(c);
-    return;
-  }, [chain, chainAssets, availableChains, currentChain]);
+  }, [chainAssets, availableChains, chainId, chainName]);
   var currency = currentChain === null || currentChain === void 0 ? void 0 : currentChain.nativeCurrency;
   var getNFTMetadataFunc = React.useCallback( /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
@@ -248,34 +243,38 @@ export var AntDesignWeb3ConfigProvider = function AntDesignWeb3ConfigProvider(pr
       };
     }()),
     disconnect: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      var _getAccount, connector;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            _context4.next = 2;
-            return disconnectAsync();
-          case 2:
+            // await disconnectAsync();
+            // TODO@jeasonstudio: wagmi useDisconnect hook 在处理多实例（config）共存时，
+            // 存在一些状态处理的 bug，暂时用更低阶 API 代替。
+            _getAccount = getAccount(config), connector = _getAccount.connector;
+            _context4.next = 3;
+            return disconnect(config, {
+              connector: connector
+            });
+          case 3:
           case "end":
             return _context4.stop();
         }
       }, _callee4);
     })),
     switchChain: ( /*#__PURE__*/function () {
-      var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(c) {
+      var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(newChain) {
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              if (chain) {
-                _context5.next = 3;
-                break;
+              if (!chain) {
+                // hava not connected any chain
+                setCurrentChain(newChain);
+              } else {
+                switchChain === null || switchChain === void 0 || switchChain({
+                  chainId: newChain.id
+                });
               }
-              // hava not connected any chain
-              setCurrentChain(c);
-              return _context5.abrupt("return");
-            case 3:
-              switchChain === null || switchChain === void 0 || switchChain({
-                chainId: c.id
-              });
-            case 4:
+            case 1:
             case "end":
               return _context5.stop();
           }

package/dist/esm/wagmi-provider/methods/addNameToAccount.d.ts

@@ -1,3 +1,3 @@
 import type { Account } from '@ant-design/web3-common';
-import { type Config } from '@wagmi/core';
+import type { Config } from 'wagmi';
 export declare function addNameToAccount(config: Config, account: Account, chainId?: number): Promise<Account>;

package/dist/esm/wagmi-provider/methods/getNFTMetadata.d.ts

@@ -1,3 +1,3 @@
 import { type NFTMetadata } from '@ant-design/web3-common';
-import { type Config } from '@wagmi/core';
+import type { Config } from 'wagmi';
 export declare function getNFTMetadata(config: Config, address: string, tokenId: bigint, chainId?: number): Promise<NFTMetadata>;

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.AntDesignWeb3ConfigProvider = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _web3Common = require("@ant-design/web3-common");
+var _core = require("@wagmi/core");
 var _wagmi = require("wagmi");
 var _utils = require("../utils");
 var _eip = require("../wallets/eip6963");
@@ -37,10 +38,6 @@ const AntDesignWeb3ConfigProvider = props => {
   const {
     switchChain
   } = (0, _wagmi.useSwitchChain)();
-  const {
-    disconnectAsync
-  } = (0, _wagmi.useDisconnect)();
-  const [currentChain, setCurrentChain] = _react.default.useState(undefined);
   const {
     data: balanceData
   } = (0, _wagmi.useBalance)({
@@ -49,18 +46,18 @@ const AntDesignWeb3ConfigProvider = props => {
   _react.default.useEffect(() => {
     if (!address || isDisconnected) {
       setAccount(undefined);
-      return;
-    }
-    const updateAccounts = async () => {
-      const a = {
-        address
+    } else {
+      const updateAccounts = async () => {
+        const a = {
+          address
+        };
+        setAccount(a);
+        if (ens) {
+          setAccount(await (0, _methods.addNameToAccount)(config, a));
+        }
       };
-      setAccount(a);
-      if (ens) {
-        setAccount(await (0, _methods.addNameToAccount)(config, a));
-      }
-    };
-    updateAccounts();
+      updateAccounts();
+    }
   }, [address, isDisconnected, chain, ens]);
   const findConnectorByName = name => {
     const commonConnector = availableConnectors.find(item => item.name === name && !(0, _utils.isEIP6963Connector)(item));
@@ -117,25 +114,22 @@ const AntDesignWeb3ConfigProvider = props => {
       return null;
     }).filter(item => item !== null);
   }, [availableChains, chainAssets]);
+  const chainId = chain?.id || availableChains?.[0]?.id;
+  const chainName = chain?.name || availableChains?.[0]?.name;
+  const [currentChain, setCurrentChain] = _react.default.useState(undefined);
   _react.default.useEffect(() => {
-    if (!chain && currentChain) {
+    setCurrentChain(prevChain => {
       // not connected any chain, keep current chain
-      return;
-    }
-    const currentWagmiChain = chain ?? availableChains[0];
-    if (!currentWagmiChain) {
-      return;
-    }
-    let c = chainAssets?.find(item => item.id === currentWagmiChain?.id);
-    if (!c?.id) {
-      c = {
-        id: currentWagmiChain.id,
-        name: currentWagmiChain.name
-      };
-    }
-    setCurrentChain(c);
-    return;
-  }, [chain, chainAssets, availableChains, currentChain]);
+      let newChain = chainAssets?.find(item => item?.id === chainId);
+      if (!newChain && chainId) {
+        newChain = {
+          id: chainId,
+          name: chainName
+        };
+      }
+      return newChain || prevChain;
+    });
+  }, [chainAssets, availableChains, chainId, chainName]);
   const currency = currentChain?.nativeCurrency;
   const getNFTMetadataFunc = _react.default.useCallback(async ({
     address: contractAddress,
@@ -168,17 +162,25 @@ const AntDesignWeb3ConfigProvider = props => {
       });
     },
     disconnect: async () => {
-      await disconnectAsync();
+      // await disconnectAsync();
+      // TODO@jeasonstudio: wagmi useDisconnect hook 在处理多实例（config）共存时，
+      // 存在一些状态处理的 bug，暂时用更低阶 API 代替。
+      const {
+        connector
+      } = (0, _core.getAccount)(config);
+      await (0, _core.disconnect)(config, {
+        connector
+      });
     },
-    switchChain: async c => {
+    switchChain: async newChain => {
       if (!chain) {
         // hava not connected any chain
-        setCurrentChain(c);
-        return;
+        setCurrentChain(newChain);
+      } else {
+        switchChain?.({
+          chainId: newChain.id
+        });
       }
-      switchChain?.({
-        chainId: c.id
-      });
     },
     getNFTMetadata: getNFTMetadataFunc,
     children: children

package/dist/lib/wagmi-provider/methods/addNameToAccount.d.ts

@@ -1,3 +1,3 @@
 import type { Account } from '@ant-design/web3-common';
-import { type Config } from '@wagmi/core';
+import type { Config } from 'wagmi';
 export declare function addNameToAccount(config: Config, account: Account, chainId?: number): Promise<Account>;

package/dist/lib/wagmi-provider/methods/getNFTMetadata.d.ts

@@ -1,3 +1,3 @@
 import { type NFTMetadata } from '@ant-design/web3-common';
-import { type Config } from '@wagmi/core';
+import type { Config } from 'wagmi';
 export declare function getNFTMetadata(config: Config, address: string, tokenId: bigint, chainId?: number): Promise<NFTMetadata>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ant-design/web3-wagmi",
-  "version": "2.4.3",
+  "version": "2.4.5",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",
@@ -10,6 +10,7 @@
     "require": "./dist/lib/index.js",
     "types": "./dist/esm/index.d.ts"
   },
+  "sideEffects": false,
   "files": [
     "dist",
     "CHANGELOG.md",
@@ -37,22 +38,23 @@
   },
   "dependencies": {
     "debug": "^4.3.4",
-    "@wagmi/core": "^2.6.5",
-    "@ant-design/web3-assets": "1.7.0",
-    "@ant-design/web3-common": "1.9.0"
+    "@wagmi/core": "^2.9.6",
+    "@ant-design/web3-assets": "1.7.2",
+    "@ant-design/web3-common": "1.10.0"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",
+    "@wagmi/core": "^2.9.3",
     "father": "^4.4.0",
     "typescript": "^5.4.4",
-    "wagmi": "^2.5.7",
-    "@tanstack/react-query": "^5.28.4",
-    "viem": ">=2.9.25"
+    "wagmi": "^2.8.6",
+    "@tanstack/react-query": "^5.37.1",
+    "viem": "^2.10.3"
   },
   "peerDependencies": {
-    "wagmi": "^2.5.7",
-    "@tanstack/react-query": "^5.28.4",
-    "viem": ">=2.9.25"
+    "wagmi": "^2.8.6",
+    "@tanstack/react-query": "^5.37.1",
+    "viem": ">=2.0.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org",