@ant-design/web3-wagmi 2.5.0 → 2.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,33 @@
1
1
  # @ant-design/web3-wagmi
2
2
 
3
+ ## 2.7.0
4
+
5
+ ### Minor Changes
6
+
7
+ - f1b85b9: feat: auto display ens avatar
8
+
9
+ ### Patch Changes
10
+
11
+ - Updated dependencies [f1b85b9]
12
+ - Updated dependencies [66aaab4]
13
+ - Updated dependencies [9321e7d]
14
+ - @ant-design/web3-common@1.12.0
15
+ - @ant-design/web3-assets@1.9.0
16
+
17
+ ## 2.6.0
18
+
19
+ ### Minor Changes
20
+
21
+ - 4abe7c0: feat: onConnected callback support provider account
22
+
23
+ ### Patch Changes
24
+
25
+ - 61c17c5: chore(wagmi): use wagmi/actions instead of wagmi/core
26
+ - Updated dependencies [0d33add]
27
+ - Updated dependencies [4abe7c0]
28
+ - @ant-design/web3-assets@1.8.1
29
+ - @ant-design/web3-common@1.11.0
30
+
3
31
  ## 2.5.0
4
32
 
5
33
  ### Minor Changes
@@ -1,21 +1,21 @@
1
1
  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; }
2
2
  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); } }
3
3
  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); }); }; }
4
+ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
5
+ function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
6
+ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
7
+ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
4
8
  function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
5
9
  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."); }
10
+ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
6
11
  function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
7
12
  function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
8
- 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); }
9
- function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
10
- function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
11
- function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
12
13
  function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
13
- function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
14
- function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
14
+ 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); }
15
15
  import React from 'react';
16
- import { fillAddressWith0x, Web3ConfigProvider } from '@ant-design/web3-common';
17
- import { disconnect, getAccount } from '@wagmi/core';
18
- import { useAccount, useBalance, useConfig, useConnect, useEnsName, useSwitchChain } from 'wagmi';
16
+ import { Web3ConfigProvider } from '@ant-design/web3-common';
17
+ import { useAccount, useBalance, useConfig, useConnect, useEnsAvatar, useEnsName, useSwitchChain } from 'wagmi';
18
+ import { disconnect, getAccount } from 'wagmi/actions';
19
19
  import { isEIP6963Connector } from "../utils";
20
20
  import { EIP6963Wallet } from "../wallets/eip6963";
21
21
  import { getNFTMetadata } from "./methods";
@@ -27,7 +27,8 @@ export var AntDesignWeb3ConfigProvider = function AntDesignWeb3ConfigProvider(pr
27
27
  walletFactorys = props.walletFactorys,
28
28
  availableChains = props.availableChains,
29
29
  availableConnectors = props.availableConnectors,
30
- ens = props.ens,
30
+ _props$ens = props.ens,
31
+ ens = _props$ens === void 0 ? true : _props$ens,
31
32
  balance = props.balance,
32
33
  locale = props.locale,
33
34
  eip6963 = props.eip6963;
@@ -36,36 +37,27 @@ export var AntDesignWeb3ConfigProvider = function AntDesignWeb3ConfigProvider(pr
36
37
  isDisconnected = _useAccount.isDisconnected,
37
38
  chain = _useAccount.chain;
38
39
  var config = useConfig();
39
- var _React$useState = React.useState(),
40
- _React$useState2 = _slicedToArray(_React$useState, 2),
41
- account = _React$useState2[0],
42
- setAccount = _React$useState2[1];
43
40
  var _useConnect = useConnect(),
44
41
  connectAsync = _useConnect.connectAsync;
45
42
  var _useSwitchChain = useSwitchChain(),
46
43
  switchChain = _useSwitchChain.switchChain;
47
44
  var _useBalance = useBalance({
48
- address: balance && account ? fillAddressWith0x(account.address) : undefined
45
+ address: address
49
46
  }),
50
47
  balanceData = _useBalance.data;
51
48
  var _useEnsName = useEnsName({
52
49
  address: address
53
50
  }),
54
51
  ensName = _useEnsName.data;
55
- React.useEffect(function () {
56
- if (!address || isDisconnected) {
57
- setAccount(undefined);
58
- } else if (ens && ensName) {
59
- setAccount({
60
- address: fillAddressWith0x(address),
61
- name: ensName
62
- });
63
- } else {
64
- setAccount({
65
- address: fillAddressWith0x(address)
66
- });
67
- }
68
- }, [address, isDisconnected, ens, ensName]);
52
+ var _useEnsAvatar = useEnsAvatar({
53
+ name: ensName !== null && ensName !== void 0 ? ensName : undefined
54
+ }),
55
+ ensAvatar = _useEnsAvatar.data;
56
+ var account = address && !isDisconnected ? {
57
+ address: address,
58
+ name: ensName && ens ? ensName : undefined,
59
+ avatar: ensAvatar !== null && ensAvatar !== void 0 ? ensAvatar : undefined
60
+ } : undefined;
69
61
  var findConnectorByName = function findConnectorByName(name) {
70
62
  var commonConnector = availableConnectors.find(function (item) {
71
63
  return item.name === name && !isEIP6963Connector(item);
@@ -137,10 +129,10 @@ export var AntDesignWeb3ConfigProvider = function AntDesignWeb3ConfigProvider(pr
137
129
  }, [availableChains, chainAssets]);
138
130
  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);
139
131
  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);
140
- var _React$useState3 = React.useState(undefined),
141
- _React$useState4 = _slicedToArray(_React$useState3, 2),
142
- currentChain = _React$useState4[0],
143
- setCurrentChain = _React$useState4[1];
132
+ var _React$useState = React.useState(undefined),
133
+ _React$useState2 = _slicedToArray(_React$useState, 2),
134
+ currentChain = _React$useState2[0],
135
+ setCurrentChain = _React$useState2[1];
144
136
  React.useEffect(function () {
145
137
  setCurrentChain(function (prevChain) {
146
138
  // not connected any chain, keep current chain
@@ -191,7 +183,7 @@ export var AntDesignWeb3ConfigProvider = function AntDesignWeb3ConfigProvider(pr
191
183
  connect: ( /*#__PURE__*/function () {
192
184
  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(wallet, options) {
193
185
  var _getWagmiConnector, _ref4;
194
- var connector;
186
+ var connector, _yield$connectAsync, accounts;
195
187
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
196
188
  while (1) switch (_context2.prev = _context2.next) {
197
189
  case 0:
@@ -214,6 +206,12 @@ export var AntDesignWeb3ConfigProvider = function AntDesignWeb3ConfigProvider(pr
214
206
  chainId: currentChain === null || currentChain === void 0 ? void 0 : currentChain.id
215
207
  });
216
208
  case 8:
209
+ _yield$connectAsync = _context2.sent;
210
+ accounts = _yield$connectAsync.accounts;
211
+ return _context2.abrupt("return", {
212
+ address: accounts === null || accounts === void 0 ? void 0 : accounts[0]
213
+ });
214
+ case 11:
217
215
  case "end":
218
216
  return _context2.stop();
219
217
  }
@@ -3,7 +3,7 @@ function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyri
3
3
  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); } }
4
4
  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); }); }; }
5
5
  import { fillAddressWith0x, requestWeb3Asset } from '@ant-design/web3-common';
6
- import { readContract } from '@wagmi/core';
6
+ import { readContract } from 'wagmi/actions';
7
7
  export function getNFTMetadata(_x, _x2, _x3, _x4) {
8
8
  return _getNFTMetadata.apply(this, arguments);
9
9
  }
@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.AntDesignWeb3ConfigProvider = void 0;
7
7
  var _react = _interopRequireDefault(require("react"));
8
8
  var _web3Common = require("@ant-design/web3-common");
9
- var _core = require("@wagmi/core");
10
9
  var _wagmi = require("wagmi");
10
+ var _actions = require("wagmi/actions");
11
11
  var _utils = require("../utils");
12
12
  var _eip = require("../wallets/eip6963");
13
13
  var _methods = require("./methods");
@@ -20,7 +20,7 @@ const AntDesignWeb3ConfigProvider = props => {
20
20
  walletFactorys,
21
21
  availableChains,
22
22
  availableConnectors,
23
- ens,
23
+ ens = true,
24
24
  balance,
25
25
  locale,
26
26
  eip6963
@@ -31,7 +31,6 @@ const AntDesignWeb3ConfigProvider = props => {
31
31
  chain
32
32
  } = (0, _wagmi.useAccount)();
33
33
  const config = (0, _wagmi.useConfig)();
34
- const [account, setAccount] = _react.default.useState();
35
34
  const {
36
35
  connectAsync
37
36
  } = (0, _wagmi.useConnect)();
@@ -41,27 +40,23 @@ const AntDesignWeb3ConfigProvider = props => {
41
40
  const {
42
41
  data: balanceData
43
42
  } = (0, _wagmi.useBalance)({
44
- address: balance && account ? (0, _web3Common.fillAddressWith0x)(account.address) : undefined
43
+ address
45
44
  });
46
45
  const {
47
46
  data: ensName
48
47
  } = (0, _wagmi.useEnsName)({
49
48
  address
50
49
  });
51
- _react.default.useEffect(() => {
52
- if (!address || isDisconnected) {
53
- setAccount(undefined);
54
- } else if (ens && ensName) {
55
- setAccount({
56
- address: (0, _web3Common.fillAddressWith0x)(address),
57
- name: ensName
58
- });
59
- } else {
60
- setAccount({
61
- address: (0, _web3Common.fillAddressWith0x)(address)
62
- });
63
- }
64
- }, [address, isDisconnected, ens, ensName]);
50
+ const {
51
+ data: ensAvatar
52
+ } = (0, _wagmi.useEnsAvatar)({
53
+ name: ensName ?? undefined
54
+ });
55
+ const account = address && !isDisconnected ? {
56
+ address,
57
+ name: ensName && ens ? ensName : undefined,
58
+ avatar: ensAvatar ?? undefined
59
+ } : undefined;
65
60
  const findConnectorByName = name => {
66
61
  const commonConnector = availableConnectors.find(item => item.name === name && !(0, _utils.isEIP6963Connector)(item));
67
62
  if (!eip6963) {
@@ -159,10 +154,15 @@ const AntDesignWeb3ConfigProvider = props => {
159
154
  if (!connector) {
160
155
  throw new Error(`Can not find connector for ${wallet?.name}`);
161
156
  }
162
- await connectAsync({
157
+ const {
158
+ accounts
159
+ } = await connectAsync({
163
160
  connector,
164
161
  chainId: currentChain?.id
165
162
  });
163
+ return {
164
+ address: accounts?.[0]
165
+ };
166
166
  },
167
167
  disconnect: async () => {
168
168
  // await disconnectAsync();
@@ -170,8 +170,8 @@ const AntDesignWeb3ConfigProvider = props => {
170
170
  // 存在一些状态处理的 bug,暂时用更低阶 API 代替。
171
171
  const {
172
172
  connector
173
- } = (0, _core.getAccount)(config);
174
- await (0, _core.disconnect)(config, {
173
+ } = (0, _actions.getAccount)(config);
174
+ await (0, _actions.disconnect)(config, {
175
175
  connector
176
176
  });
177
177
  },
@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.getNFTMetadata = getNFTMetadata;
7
7
  var _web3Common = require("@ant-design/web3-common");
8
- var _core = require("@wagmi/core");
8
+ var _actions = require("wagmi/actions");
9
9
  async function getNFTMetadata(config, address, tokenId, chainId) {
10
- const tokenURI = await (0, _core.readContract)(config, {
10
+ const tokenURI = await (0, _actions.readContract)(config, {
11
11
  address: (0, _web3Common.fillAddressWith0x)(address),
12
12
  args: [tokenId],
13
13
  chainId,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ant-design/web3-wagmi",
3
- "version": "2.5.0",
3
+ "version": "2.7.0",
4
4
  "type": "module",
5
5
  "main": "dist/esm/index.js",
6
6
  "module": "dist/esm/index.js",
@@ -28,7 +28,7 @@
28
28
  "ui",
29
29
  "web3"
30
30
  ],
31
- "homepage": "https://we3.ant.design",
31
+ "homepage": "https://web3.ant.design",
32
32
  "bugs": {
33
33
  "url": "https://github.com/ant-design/ant-design-web3/issues"
34
34
  },
@@ -38,22 +38,20 @@
38
38
  },
39
39
  "dependencies": {
40
40
  "debug": "^4.3.4",
41
- "@wagmi/core": "^2.9.6",
42
- "@ant-design/web3-assets": "1.8.0",
43
- "@ant-design/web3-common": "1.10.1"
41
+ "@ant-design/web3-assets": "1.9.0",
42
+ "@ant-design/web3-common": "1.12.0"
44
43
  },
45
44
  "devDependencies": {
46
45
  "@types/debug": "^4.1.12",
47
- "@wagmi/core": "^2.9.3",
48
- "father": "^4.4.0",
46
+ "father": "^4.4.4",
49
47
  "typescript": "^5.4.5",
50
- "wagmi": "^2.8.6",
51
- "@tanstack/react-query": "^5.37.1",
52
- "viem": "^2.10.3"
48
+ "wagmi": "^2.10.2",
49
+ "@tanstack/react-query": "^5.40.1",
50
+ "viem": "^2.15.1"
53
51
  },
54
52
  "peerDependencies": {
55
- "wagmi": "^2.8.6",
56
- "@tanstack/react-query": "^5.37.1",
53
+ "wagmi": "^2.10.2",
54
+ "@tanstack/react-query": "^5.40.1",
57
55
  "viem": ">=2.0.0"
58
56
  },
59
57
  "publishConfig": {