thirdweb 5.85.0 → 5.86.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/dist/cjs/extensions/prebuilts/deploy-marketplace.js +21 -2
- package/dist/cjs/extensions/prebuilts/deploy-marketplace.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/Modal/SmartWalletConnectUI.js +2 -47
- package/dist/cjs/react/web/ui/ConnectWallet/Modal/SmartWalletConnectUI.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/cjs/wallets/injected/index.js +14 -6
- package/dist/cjs/wallets/injected/index.js.map +1 -1
- package/dist/esm/extensions/prebuilts/deploy-marketplace.js +21 -2
- package/dist/esm/extensions/prebuilts/deploy-marketplace.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/Modal/SmartWalletConnectUI.js +3 -48
- package/dist/esm/react/web/ui/ConnectWallet/Modal/SmartWalletConnectUI.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/esm/wallets/injected/index.js +14 -6
- package/dist/esm/wallets/injected/index.js.map +1 -1
- package/dist/types/extensions/prebuilts/deploy-marketplace.d.ts +21 -2
- package/dist/types/extensions/prebuilts/deploy-marketplace.d.ts.map +1 -1
- package/dist/types/react/web/ui/ConnectWallet/Modal/SmartWalletConnectUI.d.ts.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/dist/types/wallets/injected/index.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/extensions/ens/resolve-l2-name.test.ts +1 -1
- package/src/extensions/prebuilts/deploy-marketplace.ts +21 -2
- package/src/react/web/ui/ConnectWallet/Modal/SmartWalletConnectUI.tsx +3 -132
- package/src/version.ts +1 -1
- package/src/wallets/injected/index.ts +15 -6
|
@@ -9,8 +9,27 @@ const upload_js_1 = require("../../storage/upload.js");
|
|
|
9
9
|
const royalty_engine_js_1 = require("../../utils/royalty-engine.js");
|
|
10
10
|
const initialize_js_1 = require("./__generated__/Marketplace/write/initialize.js");
|
|
11
11
|
/**
|
|
12
|
-
*
|
|
13
|
-
* @
|
|
12
|
+
* Deploys a marketplace contract.
|
|
13
|
+
* @param options - The options for deploying the marketplace contract.
|
|
14
|
+
*
|
|
15
|
+
* @extension MARKETPLACE
|
|
16
|
+
*
|
|
17
|
+
* @example
|
|
18
|
+
* ```ts
|
|
19
|
+
* import { deployMarketplaceContract } from "thirdweb/deploys";
|
|
20
|
+
*
|
|
21
|
+
* const address = await deployMarketplaceContract({
|
|
22
|
+
client,
|
|
23
|
+
chain,
|
|
24
|
+
account,
|
|
25
|
+
params: {
|
|
26
|
+
name: "MarketplaceV3",
|
|
27
|
+
description: "MarketplaceV3 deployed using thirdweb SDK",
|
|
28
|
+
platformFeeRecipient: "0x21d514c90ee4E4e4Cd16Ce9185BF01F0F1eE4A04",
|
|
29
|
+
platformFeeBps: 1000,
|
|
30
|
+
},
|
|
31
|
+
});
|
|
32
|
+
* ```
|
|
14
33
|
*/
|
|
15
34
|
async function deployMarketplaceContract(options) {
|
|
16
35
|
const { chain, client, account, params, version } = options;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-marketplace.js","sourceRoot":"","sources":["../../../../src/extensions/prebuilts/deploy-marketplace.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"deploy-marketplace.js","sourceRoot":"","sources":["../../../../src/extensions/prebuilts/deploy-marketplace.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,10 +3,8 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
exports.SmartConnectUI = SmartConnectUI;
|
|
5
5
|
const jsx_runtime_1 = require("react/jsx-runtime");
|
|
6
|
-
const react_icons_1 = require("@radix-ui/react-icons");
|
|
7
6
|
const react_query_1 = require("@tanstack/react-query");
|
|
8
7
|
const react_1 = require("react");
|
|
9
|
-
const index_js_1 = require("../../../../core/design-system/index.js");
|
|
10
8
|
const connection_manager_js_1 = require("../../../../core/providers/connection-manager.js");
|
|
11
9
|
const wallet_js_1 = require("../../../../core/utils/wallet.js");
|
|
12
10
|
const LoadingScreen_js_1 = require("../../../wallets/shared/LoadingScreen.js");
|
|
@@ -14,7 +12,6 @@ const getSmartWalletLocale_js_1 = require("../../../wallets/smartWallet/locale/g
|
|
|
14
12
|
const Spacer_js_1 = require("../../components/Spacer.js");
|
|
15
13
|
const Spinner_js_1 = require("../../components/Spinner.js");
|
|
16
14
|
const basic_js_1 = require("../../components/basic.js");
|
|
17
|
-
const buttons_js_1 = require("../../components/buttons.js");
|
|
18
15
|
const text_js_1 = require("../../components/text.js");
|
|
19
16
|
const AnyWalletConnectUI_js_1 = require("./AnyWalletConnectUI.js");
|
|
20
17
|
/**
|
|
@@ -39,19 +36,9 @@ function SmartWalletConnecting(props) {
|
|
|
39
36
|
queryKey: ["getSmartWalletLocale", props.localeId],
|
|
40
37
|
queryFn: () => (0, getSmartWalletLocale_js_1.getSmartWalletLocale)(props.localeId),
|
|
41
38
|
});
|
|
42
|
-
const { chain: smartWalletChain } = props.accountAbstraction;
|
|
43
39
|
const { personalWallet } = props;
|
|
44
40
|
const { done } = props;
|
|
45
|
-
const [personalWalletChainId, setPersonalWalletChainId] = (0, react_1.useState)(personalWallet.getChain()?.id);
|
|
46
|
-
(0, react_1.useEffect)(() => {
|
|
47
|
-
const unsubChainChanged = personalWallet.subscribe("chainChanged", (chain) => setPersonalWalletChainId(chain.id));
|
|
48
|
-
return () => {
|
|
49
|
-
unsubChainChanged();
|
|
50
|
-
};
|
|
51
|
-
}, [personalWallet]);
|
|
52
|
-
const wrongNetwork = personalWalletChainId !== smartWalletChain.id;
|
|
53
41
|
const [smartWalletConnectionStatus, setSmartWalletConnectionStatus] = (0, react_1.useState)("idle");
|
|
54
|
-
const [personalWalletChainSwitchStatus, setPersonalWalletChainSwitchStatus] = (0, react_1.useState)("idle");
|
|
55
42
|
const connectionManager = (0, connection_manager_js_1.useConnectionManager)();
|
|
56
43
|
const handleConnect = (0, react_1.useCallback)(async () => {
|
|
57
44
|
if (!personalWallet) {
|
|
@@ -79,46 +66,14 @@ function SmartWalletConnecting(props) {
|
|
|
79
66
|
]);
|
|
80
67
|
const connectStarted = (0, react_1.useRef)(false);
|
|
81
68
|
(0, react_1.useEffect)(() => {
|
|
82
|
-
if (!
|
|
69
|
+
if (!connectStarted.current) {
|
|
83
70
|
handleConnect();
|
|
84
71
|
connectStarted.current = true;
|
|
85
72
|
}
|
|
86
|
-
}, [handleConnect
|
|
73
|
+
}, [handleConnect]);
|
|
87
74
|
if (!localeQuery.data) {
|
|
88
75
|
return (0, jsx_runtime_1.jsx)(LoadingScreen_js_1.LoadingScreen, {});
|
|
89
76
|
}
|
|
90
|
-
if (wrongNetwork) {
|
|
91
|
-
return ((0, jsx_runtime_1.jsxs)(basic_js_1.Container, { fullHeight: true, animate: "fadein", flex: "column", children: [(0, jsx_runtime_1.jsx)(basic_js_1.Container, { p: "lg", children: (0, jsx_runtime_1.jsx)(basic_js_1.ModalHeader, { title: props.personalWalletInfo.name, onBack: props.onBack }) }), props.size === "compact" && (0, jsx_runtime_1.jsx)(Spacer_js_1.Spacer, { y: "lg" }), (0, jsx_runtime_1.jsx)(basic_js_1.Container, { expand: true, flex: "column", center: "both", p: "lg", children: (0, jsx_runtime_1.jsxs)(basic_js_1.Container, { p: props.size === "wide" ? "lg" : undefined, children: [(0, jsx_runtime_1.jsx)(basic_js_1.Container, { flex: "row", center: "x", color: "danger", children: (0, jsx_runtime_1.jsx)(react_icons_1.ExclamationTriangleIcon, { width: index_js_1.iconSize.lg, height: index_js_1.iconSize.lg }) }), (0, jsx_runtime_1.jsx)(Spacer_js_1.Spacer, { y: "md" }), (0, jsx_runtime_1.jsx)(text_js_1.Text, { size: "lg", color: "primaryText", center: true, weight: 500, children: localeQuery.data.wrongNetworkScreen.title }), (0, jsx_runtime_1.jsx)(Spacer_js_1.Spacer, { y: "lg" }), (0, jsx_runtime_1.jsx)(text_js_1.Text, { multiline: true, center: true, children: localeQuery.data.wrongNetworkScreen.subtitle }), (0, jsx_runtime_1.jsx)(Spacer_js_1.Spacer, { y: "xl" }), (0, jsx_runtime_1.jsxs)(basic_js_1.Container, { flex: "column", gap: "md", children: [(0, jsx_runtime_1.jsxs)(buttons_js_1.Button, { type: "button", fullWidth: true, variant: "accent", style: {
|
|
92
|
-
display: "flex",
|
|
93
|
-
alignItems: "center",
|
|
94
|
-
gap: index_js_1.spacing.sm,
|
|
95
|
-
}, onClick: async () => {
|
|
96
|
-
if (!personalWallet.switchChain) {
|
|
97
|
-
setPersonalWalletChainSwitchStatus("switch-error");
|
|
98
|
-
throw new Error("No switchChain method");
|
|
99
|
-
}
|
|
100
|
-
try {
|
|
101
|
-
setPersonalWalletChainSwitchStatus("switching");
|
|
102
|
-
await personalWallet.switchChain(smartWalletChain);
|
|
103
|
-
const newChain = personalWallet.getChain();
|
|
104
|
-
if (newChain) {
|
|
105
|
-
setPersonalWalletChainId(newChain.id);
|
|
106
|
-
}
|
|
107
|
-
setPersonalWalletChainSwitchStatus("idle");
|
|
108
|
-
}
|
|
109
|
-
catch (e) {
|
|
110
|
-
console.error(e);
|
|
111
|
-
setPersonalWalletChainSwitchStatus("switch-error");
|
|
112
|
-
}
|
|
113
|
-
}, children: [personalWalletChainSwitchStatus === "switching"
|
|
114
|
-
? "Switching"
|
|
115
|
-
: "Switch Network", personalWalletChainSwitchStatus === "switching" && ((0, jsx_runtime_1.jsx)(Spinner_js_1.Spinner, { size: "sm", color: "accentButtonText" }))] }), (0, jsx_runtime_1.jsxs)(basic_js_1.Container, { flex: "row", gap: "sm", center: "both", color: "danger", style: {
|
|
116
|
-
textAlign: "center",
|
|
117
|
-
fontSize: index_js_1.fontSize.sm,
|
|
118
|
-
opacity: personalWalletChainSwitchStatus === "switch-error" ? 1 : 0,
|
|
119
|
-
transition: "opacity 200ms ease",
|
|
120
|
-
}, children: [(0, jsx_runtime_1.jsx)(react_icons_1.ExclamationTriangleIcon, { width: index_js_1.iconSize.sm, height: index_js_1.iconSize.sm }), (0, jsx_runtime_1.jsx)("span", { children: localeQuery.data.wrongNetworkScreen.failedToSwitch })] })] })] }) })] }));
|
|
121
|
-
}
|
|
122
77
|
if (smartWalletConnectionStatus === "connect-error") {
|
|
123
78
|
return ((0, jsx_runtime_1.jsx)(basic_js_1.Container, { fullHeight: true, animate: "fadein", flex: "column", center: "both", p: "lg", style: {
|
|
124
79
|
minHeight: "300px",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SmartWalletConnectUI.js","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/ConnectWallet/Modal/SmartWalletConnectUI.tsx"],"names":[],"mappings":";AAAA,YAAY,CAAC;;
|
|
1
|
+
{"version":3,"file":"SmartWalletConnectUI.js","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/ConnectWallet/Modal/SmartWalletConnectUI.tsx"],"names":[],"mappings":"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"}
|
package/dist/cjs/version.js
CHANGED
|
@@ -49,13 +49,21 @@ async function connectEip1193Wallet({ id, provider, emitter, client, chain, }) {
|
|
|
49
49
|
// get the chainId the provider is on
|
|
50
50
|
const chainId = await provider
|
|
51
51
|
.request({ method: "eth_chainId" })
|
|
52
|
-
.then(normalizeChainId_js_1.normalizeChainId)
|
|
52
|
+
.then(normalizeChainId_js_1.normalizeChainId)
|
|
53
|
+
.catch((e) => {
|
|
54
|
+
throw new Error("Error reading chainId from provider", e);
|
|
55
|
+
});
|
|
53
56
|
let connectedChain = chain && chain.id === chainId ? chain : (0, utils_js_1.getCachedChain)(chainId);
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
57
|
+
try {
|
|
58
|
+
// if we want a specific chainId and it is not the same as the provider chainId, trigger switchChain
|
|
59
|
+
// we check for undefined chain ID since some chain-specific wallets like Abstract will not send a chain ID on connection
|
|
60
|
+
if (chain && typeof chain.id !== "undefined" && chain.id !== chainId) {
|
|
61
|
+
await switchChain(provider, chain);
|
|
62
|
+
connectedChain = chain;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
catch {
|
|
66
|
+
console.warn(`Error switching to chain ${chain?.id} - defaulting to wallet chain (${chainId})`);
|
|
59
67
|
}
|
|
60
68
|
return onConnect({
|
|
61
69
|
provider,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/wallets/injected/index.ts"],"names":[],"mappings":";;AA6BA,kDAOC;AAKD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/wallets/injected/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,27 @@ import { upload } from "../../storage/upload.js";
|
|
|
6
6
|
import { getRoyaltyEngineV1ByChainId } from "../../utils/royalty-engine.js";
|
|
7
7
|
import { initialize as initMarketplace } from "./__generated__/Marketplace/write/initialize.js";
|
|
8
8
|
/**
|
|
9
|
-
*
|
|
10
|
-
* @
|
|
9
|
+
* Deploys a marketplace contract.
|
|
10
|
+
* @param options - The options for deploying the marketplace contract.
|
|
11
|
+
*
|
|
12
|
+
* @extension MARKETPLACE
|
|
13
|
+
*
|
|
14
|
+
* @example
|
|
15
|
+
* ```ts
|
|
16
|
+
* import { deployMarketplaceContract } from "thirdweb/deploys";
|
|
17
|
+
*
|
|
18
|
+
* const address = await deployMarketplaceContract({
|
|
19
|
+
client,
|
|
20
|
+
chain,
|
|
21
|
+
account,
|
|
22
|
+
params: {
|
|
23
|
+
name: "MarketplaceV3",
|
|
24
|
+
description: "MarketplaceV3 deployed using thirdweb SDK",
|
|
25
|
+
platformFeeRecipient: "0x21d514c90ee4E4e4Cd16Ce9185BF01F0F1eE4A04",
|
|
26
|
+
platformFeeBps: 1000,
|
|
27
|
+
},
|
|
28
|
+
});
|
|
29
|
+
* ```
|
|
11
30
|
*/
|
|
12
31
|
export async function deployMarketplaceContract(options) {
|
|
13
32
|
const { chain, client, account, params, version } = options;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-marketplace.js","sourceRoot":"","sources":["../../../../src/extensions/prebuilts/deploy-marketplace.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAC;AAE/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAE3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,qDAAqD,CAAC;AAC3F,OAAO,EACL,wBAAwB,EACxB,oCAAoC,GACrC,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAEjD,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAG5E,OAAO,EAAE,UAAU,IAAI,eAAe,EAAE,MAAM,iDAAiD,CAAC;AAuBhG
|
|
1
|
+
{"version":3,"file":"deploy-marketplace.js","sourceRoot":"","sources":["../../../../src/extensions/prebuilts/deploy-marketplace.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,14 @@
|
|
|
1
1
|
"use client";
|
|
2
2
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
3
|
-
import { ExclamationTriangleIcon } from "@radix-ui/react-icons";
|
|
4
3
|
import { useQuery } from "@tanstack/react-query";
|
|
5
4
|
import { useCallback, useEffect, useRef, useState } from "react";
|
|
6
|
-
import { fontSize, iconSize, spacing, } from "../../../../core/design-system/index.js";
|
|
7
5
|
import { useConnectionManager } from "../../../../core/providers/connection-manager.js";
|
|
8
6
|
import { useWalletInfo } from "../../../../core/utils/wallet.js";
|
|
9
7
|
import { LoadingScreen } from "../../../wallets/shared/LoadingScreen.js";
|
|
10
8
|
import { getSmartWalletLocale } from "../../../wallets/smartWallet/locale/getSmartWalletLocale.js";
|
|
11
9
|
import { Spacer } from "../../components/Spacer.js";
|
|
12
10
|
import { Spinner } from "../../components/Spinner.js";
|
|
13
|
-
import { Container
|
|
14
|
-
import { Button } from "../../components/buttons.js";
|
|
11
|
+
import { Container } from "../../components/basic.js";
|
|
15
12
|
import { Text } from "../../components/text.js";
|
|
16
13
|
import { AnyWalletConnectUI } from "./AnyWalletConnectUI.js";
|
|
17
14
|
/**
|
|
@@ -36,19 +33,9 @@ function SmartWalletConnecting(props) {
|
|
|
36
33
|
queryKey: ["getSmartWalletLocale", props.localeId],
|
|
37
34
|
queryFn: () => getSmartWalletLocale(props.localeId),
|
|
38
35
|
});
|
|
39
|
-
const { chain: smartWalletChain } = props.accountAbstraction;
|
|
40
36
|
const { personalWallet } = props;
|
|
41
37
|
const { done } = props;
|
|
42
|
-
const [personalWalletChainId, setPersonalWalletChainId] = useState(personalWallet.getChain()?.id);
|
|
43
|
-
useEffect(() => {
|
|
44
|
-
const unsubChainChanged = personalWallet.subscribe("chainChanged", (chain) => setPersonalWalletChainId(chain.id));
|
|
45
|
-
return () => {
|
|
46
|
-
unsubChainChanged();
|
|
47
|
-
};
|
|
48
|
-
}, [personalWallet]);
|
|
49
|
-
const wrongNetwork = personalWalletChainId !== smartWalletChain.id;
|
|
50
38
|
const [smartWalletConnectionStatus, setSmartWalletConnectionStatus] = useState("idle");
|
|
51
|
-
const [personalWalletChainSwitchStatus, setPersonalWalletChainSwitchStatus] = useState("idle");
|
|
52
39
|
const connectionManager = useConnectionManager();
|
|
53
40
|
const handleConnect = useCallback(async () => {
|
|
54
41
|
if (!personalWallet) {
|
|
@@ -76,46 +63,14 @@ function SmartWalletConnecting(props) {
|
|
|
76
63
|
]);
|
|
77
64
|
const connectStarted = useRef(false);
|
|
78
65
|
useEffect(() => {
|
|
79
|
-
if (!
|
|
66
|
+
if (!connectStarted.current) {
|
|
80
67
|
handleConnect();
|
|
81
68
|
connectStarted.current = true;
|
|
82
69
|
}
|
|
83
|
-
}, [handleConnect
|
|
70
|
+
}, [handleConnect]);
|
|
84
71
|
if (!localeQuery.data) {
|
|
85
72
|
return _jsx(LoadingScreen, {});
|
|
86
73
|
}
|
|
87
|
-
if (wrongNetwork) {
|
|
88
|
-
return (_jsxs(Container, { fullHeight: true, animate: "fadein", flex: "column", children: [_jsx(Container, { p: "lg", children: _jsx(ModalHeader, { title: props.personalWalletInfo.name, onBack: props.onBack }) }), props.size === "compact" && _jsx(Spacer, { y: "lg" }), _jsx(Container, { expand: true, flex: "column", center: "both", p: "lg", children: _jsxs(Container, { p: props.size === "wide" ? "lg" : undefined, children: [_jsx(Container, { flex: "row", center: "x", color: "danger", children: _jsx(ExclamationTriangleIcon, { width: iconSize.lg, height: iconSize.lg }) }), _jsx(Spacer, { y: "md" }), _jsx(Text, { size: "lg", color: "primaryText", center: true, weight: 500, children: localeQuery.data.wrongNetworkScreen.title }), _jsx(Spacer, { y: "lg" }), _jsx(Text, { multiline: true, center: true, children: localeQuery.data.wrongNetworkScreen.subtitle }), _jsx(Spacer, { y: "xl" }), _jsxs(Container, { flex: "column", gap: "md", children: [_jsxs(Button, { type: "button", fullWidth: true, variant: "accent", style: {
|
|
89
|
-
display: "flex",
|
|
90
|
-
alignItems: "center",
|
|
91
|
-
gap: spacing.sm,
|
|
92
|
-
}, onClick: async () => {
|
|
93
|
-
if (!personalWallet.switchChain) {
|
|
94
|
-
setPersonalWalletChainSwitchStatus("switch-error");
|
|
95
|
-
throw new Error("No switchChain method");
|
|
96
|
-
}
|
|
97
|
-
try {
|
|
98
|
-
setPersonalWalletChainSwitchStatus("switching");
|
|
99
|
-
await personalWallet.switchChain(smartWalletChain);
|
|
100
|
-
const newChain = personalWallet.getChain();
|
|
101
|
-
if (newChain) {
|
|
102
|
-
setPersonalWalletChainId(newChain.id);
|
|
103
|
-
}
|
|
104
|
-
setPersonalWalletChainSwitchStatus("idle");
|
|
105
|
-
}
|
|
106
|
-
catch (e) {
|
|
107
|
-
console.error(e);
|
|
108
|
-
setPersonalWalletChainSwitchStatus("switch-error");
|
|
109
|
-
}
|
|
110
|
-
}, children: [personalWalletChainSwitchStatus === "switching"
|
|
111
|
-
? "Switching"
|
|
112
|
-
: "Switch Network", personalWalletChainSwitchStatus === "switching" && (_jsx(Spinner, { size: "sm", color: "accentButtonText" }))] }), _jsxs(Container, { flex: "row", gap: "sm", center: "both", color: "danger", style: {
|
|
113
|
-
textAlign: "center",
|
|
114
|
-
fontSize: fontSize.sm,
|
|
115
|
-
opacity: personalWalletChainSwitchStatus === "switch-error" ? 1 : 0,
|
|
116
|
-
transition: "opacity 200ms ease",
|
|
117
|
-
}, children: [_jsx(ExclamationTriangleIcon, { width: iconSize.sm, height: iconSize.sm }), _jsx("span", { children: localeQuery.data.wrongNetworkScreen.failedToSwitch })] })] })] }) })] }));
|
|
118
|
-
}
|
|
119
74
|
if (smartWalletConnectionStatus === "connect-error") {
|
|
120
75
|
return (_jsx(Container, { fullHeight: true, animate: "fadein", flex: "column", center: "both", p: "lg", style: {
|
|
121
76
|
minHeight: "300px",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SmartWalletConnectUI.js","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/ConnectWallet/Modal/SmartWalletConnectUI.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AACb,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"SmartWalletConnectUI.js","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/ConnectWallet/Modal/SmartWalletConnectUI.tsx"],"names":[],"mappings":"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"}
|
package/dist/esm/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = "5.
|
|
1
|
+
export const version = "5.86.0";
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
|
@@ -44,13 +44,21 @@ export async function connectEip1193Wallet({ id, provider, emitter, client, chai
|
|
|
44
44
|
// get the chainId the provider is on
|
|
45
45
|
const chainId = await provider
|
|
46
46
|
.request({ method: "eth_chainId" })
|
|
47
|
-
.then(normalizeChainId)
|
|
47
|
+
.then(normalizeChainId)
|
|
48
|
+
.catch((e) => {
|
|
49
|
+
throw new Error("Error reading chainId from provider", e);
|
|
50
|
+
});
|
|
48
51
|
let connectedChain = chain && chain.id === chainId ? chain : getCachedChain(chainId);
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
52
|
+
try {
|
|
53
|
+
// if we want a specific chainId and it is not the same as the provider chainId, trigger switchChain
|
|
54
|
+
// we check for undefined chain ID since some chain-specific wallets like Abstract will not send a chain ID on connection
|
|
55
|
+
if (chain && typeof chain.id !== "undefined" && chain.id !== chainId) {
|
|
56
|
+
await switchChain(provider, chain);
|
|
57
|
+
connectedChain = chain;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
catch {
|
|
61
|
+
console.warn(`Error switching to chain ${chain?.id} - defaulting to wallet chain (${chainId})`);
|
|
54
62
|
}
|
|
55
63
|
return onConnect({
|
|
56
64
|
provider,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/wallets/injected/index.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,uBAAuB,EACvB,kBAAkB,EAClB,iBAAiB,GAClB,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAExE,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAEL,WAAW,EACX,WAAW,EACX,eAAe,GAChB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,oDAAoD,CAAC;AAIpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAGhE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,kCAAkC;AAClC,MAAM,UAAU,mBAAmB,CAAC,QAAkB;IACpD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,2CAA2C,QAAQ,GAAG,CAAC,CAAC;IAC1E,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,EACzC,EAAE,EACF,QAAQ,EACR,OAAO,EACP,MAAM,EACN,KAAK,GAON;IACC,IAAI,SAA+B,CAAC;IACpC,MAAM,OAAO,GAAG,CAAC,CAAC;IAClB,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,2EAA2E;IAC3E,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,QAAQ,GAAG,OAAO,EAAE,CAAC;QAC7C,IAAI,CAAC;YACH,SAAS,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC;gBACjC,MAAM,EAAE,qBAAqB;aAC9B,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjB,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;QAC3D,CAAC;QACD,QAAQ,EAAE,CAAC;IACb,CAAC;IAED,MAAM,IAAI,GAAG,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5B,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;IACxE,CAAC;IAED,wBAAwB;IACxB,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAEjC,qCAAqC;IACrC,MAAM,OAAO,GAAG,MAAM,QAAQ;SAC3B,OAAO,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;SAClC,IAAI,CAAC,gBAAgB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/wallets/injected/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,8 +20,27 @@ export type DeployMarketplaceContractOptions = Prettify<ClientAndChainAndAccount
|
|
|
20
20
|
version?: string;
|
|
21
21
|
}>;
|
|
22
22
|
/**
|
|
23
|
-
*
|
|
24
|
-
* @
|
|
23
|
+
* Deploys a marketplace contract.
|
|
24
|
+
* @param options - The options for deploying the marketplace contract.
|
|
25
|
+
*
|
|
26
|
+
* @extension MARKETPLACE
|
|
27
|
+
*
|
|
28
|
+
* @example
|
|
29
|
+
* ```ts
|
|
30
|
+
* import { deployMarketplaceContract } from "thirdweb/deploys";
|
|
31
|
+
*
|
|
32
|
+
* const address = await deployMarketplaceContract({
|
|
33
|
+
client,
|
|
34
|
+
chain,
|
|
35
|
+
account,
|
|
36
|
+
params: {
|
|
37
|
+
name: "MarketplaceV3",
|
|
38
|
+
description: "MarketplaceV3 deployed using thirdweb SDK",
|
|
39
|
+
platformFeeRecipient: "0x21d514c90ee4E4e4Cd16Ce9185BF01F0F1eE4A04",
|
|
40
|
+
platformFeeBps: 1000,
|
|
41
|
+
},
|
|
42
|
+
});
|
|
43
|
+
* ```
|
|
25
44
|
*/
|
|
26
45
|
export declare function deployMarketplaceContract(options: DeployMarketplaceContractOptions): Promise<string>;
|
|
27
46
|
//# sourceMappingURL=deploy-marketplace.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-marketplace.d.ts","sourceRoot":"","sources":["../../../../src/extensions/prebuilts/deploy-marketplace.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAIV,OAAO,EACR,MAAM,SAAS,CAAC;AAWjB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAE1E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAGrE,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,oBAAoB,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,gCAAgC,GAAG,QAAQ,CACrD,wBAAwB,GAAG;IACzB,MAAM,EAAE,yBAAyB,CAAC;CACnC,GAAG;IACF,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CACF,CAAC;AAEF
|
|
1
|
+
{"version":3,"file":"deploy-marketplace.d.ts","sourceRoot":"","sources":["../../../../src/extensions/prebuilts/deploy-marketplace.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAIV,OAAO,EACR,MAAM,SAAS,CAAC;AAWjB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAE1E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAGrE,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,oBAAoB,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,gCAAgC,GAAG,QAAQ,CACrD,wBAAwB,GAAG;IACzB,MAAM,EAAE,yBAAyB,CAAC;CACnC,GAAG;IACF,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CACF,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,gCAAgC,mBAoG1C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SmartWalletConnectUI.d.ts","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/ConnectWallet/Modal/SmartWalletConnectUI.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SmartWalletConnectUI.d.ts","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/ConnectWallet/Modal/SmartWalletConnectUI.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6CAA6C,CAAC;AAC1E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAYhF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGxD;;GAEG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE;IACpC,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,kBAAkB,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IAC7C,IAAI,EAAE;QACJ,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;QAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC3B,CAAC;IACF,IAAI,EAAE,SAAS,GAAG,MAAM,CAAC;IACzB,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC;IACzB,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC;IAC5B,aAAa,EAAE,aAAa,CAAC;IAC7B,aAAa,EACT;QACE,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,GACD,SAAS,CAAC;CACf,8CAyCA"}
|
package/dist/types/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "5.
|
|
1
|
+
export declare const version = "5.86.0";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/wallets/injected/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAQ5C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAS7D,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AACjF,OAAO,KAAK,EAAE,OAAO,EAAyB,MAAM,yBAAyB,CAAC;AAC9E,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAInD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,gDAOrD;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,EACzC,EAAE,EACF,QAAQ,EACR,OAAO,EACP,MAAM,EACN,KAAK,GACN,EAAE;IACD,EAAE,EAAE,0BAA0B,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC;IAC/C,QAAQ,EAAE,eAAe,CAAC;IAC1B,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,OAAO,EAAE,aAAa,CAAC,0BAA0B,CAAC,CAAC;CACpD,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/wallets/injected/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAQ5C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAS7D,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AACjF,OAAO,KAAK,EAAE,OAAO,EAAyB,MAAM,yBAAyB,CAAC;AAC9E,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAInD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,gDAOrD;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,EACzC,EAAE,EACF,QAAQ,EACR,OAAO,EACP,MAAM,EACN,KAAK,GACN,EAAE;IACD,EAAE,EAAE,0BAA0B,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC;IAC/C,QAAQ,EAAE,eAAe,CAAC;IAC1B,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,OAAO,EAAE,aAAa,CAAC,0BAA0B,CAAC,CAAC;CACpD,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,CAyDxC;AAED;;GAEG;AACH,wBAAsB,wBAAwB,CAAC,EAC7C,EAAE,EACF,QAAQ,EACR,OAAO,EACP,MAAM,EACN,KAAK,GACN,EAAE;IACD,EAAE,EAAE,0BAA0B,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC;IAC/C,QAAQ,EAAE,eAAe,CAAC;IAC1B,OAAO,EAAE,aAAa,CAAC,0BAA0B,CAAC,CAAC;IACnD,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,CAAC,EAAE,KAAK,CAAC;CACf,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,CA8BxC;AA+HD;;;GAGG;AACH,iBAAe,SAAS,CAAC,EACvB,QAAQ,EACR,OAAO,EACP,KAAK,EACL,OAAO,EACP,MAAM,EACN,EAAE,GACH,EAAE;IACD,QAAQ,EAAE,eAAe,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,aAAa,CAAC,0BAA0B,CAAC,CAAC;IACnD,MAAM,EAAE,cAAc,CAAC;IACvB,EAAE,EAAE,QAAQ,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC;CAC9B,GAAG,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC,CA8CzD"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "thirdweb",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.86.0",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "git+https://github.com/thirdweb-dev/js.git#main"
|
|
@@ -315,7 +315,7 @@
|
|
|
315
315
|
"@storybook/addon-interactions": "8.4.7",
|
|
316
316
|
"@storybook/addon-links": "8.4.7",
|
|
317
317
|
"@storybook/addon-onboarding": "8.4.7",
|
|
318
|
-
"@storybook/react": "8.
|
|
318
|
+
"@storybook/react": "8.5.0",
|
|
319
319
|
"@storybook/react-vite": "8.4.7",
|
|
320
320
|
"@storybook/test": "8.4.7",
|
|
321
321
|
"@testing-library/jest-dom": "^6.6.3",
|
|
@@ -7,7 +7,7 @@ import { resolveL2Name } from "./resolve-l2-name.js";
|
|
|
7
7
|
// skip this test suite if there is no secret key available to test with
|
|
8
8
|
// TODO: remove reliance on secret key during unit tests entirely
|
|
9
9
|
describe.runIf(process.env.TW_SECRET_KEY)("ENS:resolve-l2-name", () => {
|
|
10
|
-
it("should resolve Basename", async () => {
|
|
10
|
+
it.skip("should resolve Basename", async () => {
|
|
11
11
|
const ens = await resolveL2Name({
|
|
12
12
|
client: TEST_CLIENT,
|
|
13
13
|
// myk.base.eth
|
|
@@ -42,8 +42,27 @@ export type DeployMarketplaceContractOptions = Prettify<
|
|
|
42
42
|
>;
|
|
43
43
|
|
|
44
44
|
/**
|
|
45
|
-
*
|
|
46
|
-
* @
|
|
45
|
+
* Deploys a marketplace contract.
|
|
46
|
+
* @param options - The options for deploying the marketplace contract.
|
|
47
|
+
*
|
|
48
|
+
* @extension MARKETPLACE
|
|
49
|
+
*
|
|
50
|
+
* @example
|
|
51
|
+
* ```ts
|
|
52
|
+
* import { deployMarketplaceContract } from "thirdweb/deploys";
|
|
53
|
+
*
|
|
54
|
+
* const address = await deployMarketplaceContract({
|
|
55
|
+
client,
|
|
56
|
+
chain,
|
|
57
|
+
account,
|
|
58
|
+
params: {
|
|
59
|
+
name: "MarketplaceV3",
|
|
60
|
+
description: "MarketplaceV3 deployed using thirdweb SDK",
|
|
61
|
+
platformFeeRecipient: "0x21d514c90ee4E4e4Cd16Ce9185BF01F0F1eE4A04",
|
|
62
|
+
platformFeeBps: 1000,
|
|
63
|
+
},
|
|
64
|
+
});
|
|
65
|
+
* ```
|
|
47
66
|
*/
|
|
48
67
|
export async function deployMarketplaceContract(
|
|
49
68
|
options: DeployMarketplaceContractOptions,
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
"use client";
|
|
2
|
-
import { ExclamationTriangleIcon } from "@radix-ui/react-icons";
|
|
3
2
|
import { useQuery } from "@tanstack/react-query";
|
|
4
3
|
import { useCallback, useEffect, useRef, useState } from "react";
|
|
5
4
|
import type { Chain } from "../../../../../chains/types.js";
|
|
@@ -7,11 +6,6 @@ import type { ThirdwebClient } from "../../../../../client/client.js";
|
|
|
7
6
|
import type { Wallet } from "../../../../../wallets/interfaces/wallet.js";
|
|
8
7
|
import type { SmartWalletOptions } from "../../../../../wallets/smart/types.js";
|
|
9
8
|
import type { WalletInfo } from "../../../../../wallets/wallet-info.js";
|
|
10
|
-
import {
|
|
11
|
-
fontSize,
|
|
12
|
-
iconSize,
|
|
13
|
-
spacing,
|
|
14
|
-
} from "../../../../core/design-system/index.js";
|
|
15
9
|
import { useConnectionManager } from "../../../../core/providers/connection-manager.js";
|
|
16
10
|
import { useWalletInfo } from "../../../../core/utils/wallet.js";
|
|
17
11
|
import { LoadingScreen } from "../../../wallets/shared/LoadingScreen.js";
|
|
@@ -19,8 +13,7 @@ import { getSmartWalletLocale } from "../../../wallets/smartWallet/locale/getSma
|
|
|
19
13
|
import type { SmartWalletLocale } from "../../../wallets/smartWallet/locale/types.js";
|
|
20
14
|
import { Spacer } from "../../components/Spacer.js";
|
|
21
15
|
import { Spinner } from "../../components/Spinner.js";
|
|
22
|
-
import { Container
|
|
23
|
-
import { Button } from "../../components/buttons.js";
|
|
16
|
+
import { Container } from "../../components/basic.js";
|
|
24
17
|
import { Text } from "../../components/text.js";
|
|
25
18
|
import type { LocaleId } from "../../types.js";
|
|
26
19
|
import type { ConnectLocale } from "../locale/types.js";
|
|
@@ -109,32 +102,11 @@ function SmartWalletConnecting(props: {
|
|
|
109
102
|
queryKey: ["getSmartWalletLocale", props.localeId],
|
|
110
103
|
queryFn: () => getSmartWalletLocale(props.localeId),
|
|
111
104
|
});
|
|
112
|
-
const { chain: smartWalletChain } = props.accountAbstraction;
|
|
113
|
-
|
|
114
105
|
const { personalWallet } = props;
|
|
115
106
|
const { done } = props;
|
|
116
107
|
|
|
117
|
-
const [personalWalletChainId, setPersonalWalletChainId] = useState<
|
|
118
|
-
number | undefined
|
|
119
|
-
>(personalWallet.getChain()?.id);
|
|
120
|
-
|
|
121
|
-
useEffect(() => {
|
|
122
|
-
const unsubChainChanged = personalWallet.subscribe(
|
|
123
|
-
"chainChanged",
|
|
124
|
-
(chain) => setPersonalWalletChainId(chain.id),
|
|
125
|
-
);
|
|
126
|
-
|
|
127
|
-
return () => {
|
|
128
|
-
unsubChainChanged();
|
|
129
|
-
};
|
|
130
|
-
}, [personalWallet]);
|
|
131
|
-
|
|
132
|
-
const wrongNetwork = personalWalletChainId !== smartWalletChain.id;
|
|
133
|
-
|
|
134
108
|
const [smartWalletConnectionStatus, setSmartWalletConnectionStatus] =
|
|
135
109
|
useState<"connecting" | "connect-error" | "idle">("idle");
|
|
136
|
-
const [personalWalletChainSwitchStatus, setPersonalWalletChainSwitchStatus] =
|
|
137
|
-
useState<"switching" | "switch-error" | "idle">("idle");
|
|
138
110
|
const connectionManager = useConnectionManager();
|
|
139
111
|
|
|
140
112
|
const handleConnect = useCallback(async () => {
|
|
@@ -168,117 +140,16 @@ function SmartWalletConnecting(props: {
|
|
|
168
140
|
|
|
169
141
|
const connectStarted = useRef(false);
|
|
170
142
|
useEffect(() => {
|
|
171
|
-
if (!
|
|
143
|
+
if (!connectStarted.current) {
|
|
172
144
|
handleConnect();
|
|
173
145
|
connectStarted.current = true;
|
|
174
146
|
}
|
|
175
|
-
}, [handleConnect
|
|
147
|
+
}, [handleConnect]);
|
|
176
148
|
|
|
177
149
|
if (!localeQuery.data) {
|
|
178
150
|
return <LoadingScreen />;
|
|
179
151
|
}
|
|
180
152
|
|
|
181
|
-
if (wrongNetwork) {
|
|
182
|
-
return (
|
|
183
|
-
<Container fullHeight animate="fadein" flex="column">
|
|
184
|
-
<Container p="lg">
|
|
185
|
-
<ModalHeader
|
|
186
|
-
title={props.personalWalletInfo.name}
|
|
187
|
-
onBack={props.onBack}
|
|
188
|
-
/>
|
|
189
|
-
</Container>
|
|
190
|
-
|
|
191
|
-
{props.size === "compact" && <Spacer y="lg" />}
|
|
192
|
-
|
|
193
|
-
<Container expand flex="column" center="both" p="lg">
|
|
194
|
-
<Container p={props.size === "wide" ? "lg" : undefined}>
|
|
195
|
-
<Container flex="row" center="x" color="danger">
|
|
196
|
-
<ExclamationTriangleIcon
|
|
197
|
-
width={iconSize.lg}
|
|
198
|
-
height={iconSize.lg}
|
|
199
|
-
/>
|
|
200
|
-
</Container>
|
|
201
|
-
|
|
202
|
-
<Spacer y="md" />
|
|
203
|
-
|
|
204
|
-
<Text size="lg" color="primaryText" center weight={500}>
|
|
205
|
-
{localeQuery.data.wrongNetworkScreen.title}
|
|
206
|
-
</Text>
|
|
207
|
-
|
|
208
|
-
<Spacer y="lg" />
|
|
209
|
-
|
|
210
|
-
<Text multiline center>
|
|
211
|
-
{localeQuery.data.wrongNetworkScreen.subtitle}
|
|
212
|
-
</Text>
|
|
213
|
-
|
|
214
|
-
<Spacer y="xl" />
|
|
215
|
-
|
|
216
|
-
<Container flex="column" gap="md">
|
|
217
|
-
<Button
|
|
218
|
-
type="button"
|
|
219
|
-
fullWidth
|
|
220
|
-
variant="accent"
|
|
221
|
-
style={{
|
|
222
|
-
display: "flex",
|
|
223
|
-
alignItems: "center",
|
|
224
|
-
gap: spacing.sm,
|
|
225
|
-
}}
|
|
226
|
-
onClick={async () => {
|
|
227
|
-
if (!personalWallet.switchChain) {
|
|
228
|
-
setPersonalWalletChainSwitchStatus("switch-error");
|
|
229
|
-
throw new Error("No switchChain method");
|
|
230
|
-
}
|
|
231
|
-
|
|
232
|
-
try {
|
|
233
|
-
setPersonalWalletChainSwitchStatus("switching");
|
|
234
|
-
await personalWallet.switchChain(smartWalletChain);
|
|
235
|
-
const newChain = personalWallet.getChain();
|
|
236
|
-
if (newChain) {
|
|
237
|
-
setPersonalWalletChainId(newChain.id);
|
|
238
|
-
}
|
|
239
|
-
setPersonalWalletChainSwitchStatus("idle");
|
|
240
|
-
} catch (e) {
|
|
241
|
-
console.error(e);
|
|
242
|
-
setPersonalWalletChainSwitchStatus("switch-error");
|
|
243
|
-
}
|
|
244
|
-
}}
|
|
245
|
-
>
|
|
246
|
-
{personalWalletChainSwitchStatus === "switching"
|
|
247
|
-
? "Switching"
|
|
248
|
-
: "Switch Network"}
|
|
249
|
-
{personalWalletChainSwitchStatus === "switching" && (
|
|
250
|
-
<Spinner size="sm" color="accentButtonText" />
|
|
251
|
-
)}
|
|
252
|
-
</Button>
|
|
253
|
-
|
|
254
|
-
<Container
|
|
255
|
-
flex="row"
|
|
256
|
-
gap="sm"
|
|
257
|
-
center="both"
|
|
258
|
-
color="danger"
|
|
259
|
-
style={{
|
|
260
|
-
textAlign: "center",
|
|
261
|
-
fontSize: fontSize.sm,
|
|
262
|
-
opacity:
|
|
263
|
-
personalWalletChainSwitchStatus === "switch-error" ? 1 : 0,
|
|
264
|
-
transition: "opacity 200ms ease",
|
|
265
|
-
}}
|
|
266
|
-
>
|
|
267
|
-
<ExclamationTriangleIcon
|
|
268
|
-
width={iconSize.sm}
|
|
269
|
-
height={iconSize.sm}
|
|
270
|
-
/>
|
|
271
|
-
<span>
|
|
272
|
-
{localeQuery.data.wrongNetworkScreen.failedToSwitch}
|
|
273
|
-
</span>
|
|
274
|
-
</Container>
|
|
275
|
-
</Container>
|
|
276
|
-
</Container>
|
|
277
|
-
</Container>
|
|
278
|
-
</Container>
|
|
279
|
-
);
|
|
280
|
-
}
|
|
281
|
-
|
|
282
153
|
if (smartWalletConnectionStatus === "connect-error") {
|
|
283
154
|
return (
|
|
284
155
|
<Container
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = "5.
|
|
1
|
+
export const version = "5.86.0";
|
|
@@ -79,16 +79,25 @@ export async function connectEip1193Wallet({
|
|
|
79
79
|
// get the chainId the provider is on
|
|
80
80
|
const chainId = await provider
|
|
81
81
|
.request({ method: "eth_chainId" })
|
|
82
|
-
.then(normalizeChainId)
|
|
82
|
+
.then(normalizeChainId)
|
|
83
|
+
.catch((e) => {
|
|
84
|
+
throw new Error("Error reading chainId from provider", e);
|
|
85
|
+
});
|
|
83
86
|
|
|
84
87
|
let connectedChain =
|
|
85
88
|
chain && chain.id === chainId ? chain : getCachedChain(chainId);
|
|
86
89
|
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
90
|
+
try {
|
|
91
|
+
// if we want a specific chainId and it is not the same as the provider chainId, trigger switchChain
|
|
92
|
+
// we check for undefined chain ID since some chain-specific wallets like Abstract will not send a chain ID on connection
|
|
93
|
+
if (chain && typeof chain.id !== "undefined" && chain.id !== chainId) {
|
|
94
|
+
await switchChain(provider, chain);
|
|
95
|
+
connectedChain = chain;
|
|
96
|
+
}
|
|
97
|
+
} catch {
|
|
98
|
+
console.warn(
|
|
99
|
+
`Error switching to chain ${chain?.id} - defaulting to wallet chain (${chainId})`,
|
|
100
|
+
);
|
|
92
101
|
}
|
|
93
102
|
|
|
94
103
|
return onConnect({
|