Skip to content

Commit 6263aff

Browse files
GiselleNessiGiselleNessi
authored
Merge branch 'main' into gi/product-feedback-top-menu
2 parents 31c4ab8 + ea46572 commit 6263aff

File tree

8 files changed

+331
-92
lines changed

8 files changed

+331
-92
lines changed

‎.changeset/wide-flies-raise.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"thirdweb": patch
3+
---
4+
5+
Filter out AGW from searchable wallets (needs explicit adding)

‎apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/client/live-stats.tsx‎

Lines changed: 94 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@ function useChainStatswithRPC(_rpcUrl: string) {
4343
const latency = (performance.now() - startTimeStamp).toFixed(0);
4444

4545
const blockNumber = Number.parseInt(json.result.number, 16);
46-
const blockGasLimit = Number.parseInt(json.result.gasLimit, 16);
4746
return {
48-
blockGasLimit,
4947
blockNumber,
5048
latency,
5149
};
@@ -61,8 +59,70 @@ function useChainStatswithRPC(_rpcUrl: string) {
6159
});
6260
}
6361

62+
function useEIP7702Support(_rpcUrl: string) {
63+
let rpcUrl = _rpcUrl.replace(
64+
// eslint-disable-next-line no-template-curly-in-string
65+
// biome-ignore lint/suspicious/noTemplateCurlyInString: this is expected in this case
66+
"${THIRDWEB_API_KEY}",
67+
NEXT_PUBLIC_DASHBOARD_CLIENT_ID,
68+
);
69+
70+
// based on the environment hit dev or production
71+
if (hostnameEndsWith(rpcUrl, "rpc.thirdweb.com")) {
72+
if (!isProd) {
73+
rpcUrl = rpcUrl.replace("rpc.thirdweb.com", "rpc.thirdweb-dev.com");
74+
}
75+
}
76+
77+
return useQuery({
78+
enabled: !!rpcUrl,
79+
queryFn: async () => {
80+
try {
81+
const res = await fetch(rpcUrl, {
82+
body: JSON.stringify({
83+
id: 1,
84+
jsonrpc: "2.0",
85+
method: "eth_estimateGas",
86+
params: [
87+
{
88+
from: "0xdeadbeef00000000000000000000000000000000",
89+
to: "0xdeadbeef00000000000000000000000000000000",
90+
data: "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
91+
value: "0x0",
92+
},
93+
"latest",
94+
{
95+
"0xdeadbeef00000000000000000000000000000000": {
96+
code: "0xef01000000000000000000000000000000000000000001",
97+
},
98+
},
99+
],
100+
}),
101+
method: "POST",
102+
});
103+
104+
const json = await res.json();
105+
106+
// If the response has a valid result object, EIP-7702 is enabled
107+
return {
108+
isSupported: !!json.result,
109+
};
110+
} catch {
111+
// If the request fails or errors, EIP-7702 is not supported
112+
return {
113+
isSupported: false,
114+
};
115+
}
116+
},
117+
queryKey: ["eip-7702-support", { rpcUrl }],
118+
refetchInterval: false, // Don't refetch this as it's unlikely to change
119+
refetchOnWindowFocus: false,
120+
});
121+
}
122+
64123
export function ChainLiveStats(props: { rpc: string }) {
65124
const stats = useChainStatswithRPC(props.rpc);
125+
const eip7702Support = useEIP7702Support(props.rpc);
66126

67127
return (
68128
<>
@@ -107,8 +167,8 @@ export function ChainLiveStats(props: { rpc: string }) {
107167
)}
108168
</PrimaryInfoItem>
109169

110-
{/* Block Height */}
111-
<PrimaryInfoItem title="Block Height" titleIcon={<PulseDot />}>
170+
{/* Latest Block */}
171+
<PrimaryInfoItem title="Latest Block" titleIcon={<PulseDot />}>
112172
{stats.isError ? (
113173
<p className="fade-in-0 animate-in text-destructive-text">N/A</p>
114174
) : stats.data ? (
@@ -120,16 +180,37 @@ export function ChainLiveStats(props: { rpc: string }) {
120180
)}
121181
</PrimaryInfoItem>
122182

123-
{/* Block Gas Limit */}
124-
<PrimaryInfoItem title="Block Gas Limit" titleIcon={<PulseDot />}>
125-
{stats.isError ? (
126-
<p className="fade-in-0 animate-in text-destructive-text">N/A</p>
127-
) : stats.data ? (
128-
<p className="fade-in-0 animate-in">
129-
{stats.data.blockGasLimit ?? "N/A"}
130-
</p>
183+
{/* EIP-7702 */}
184+
<PrimaryInfoItem
185+
title="EIP-7702"
186+
titleIcon={
187+
eip7702Support.data ? (
188+
eip7702Support.data.isSupported ? (
189+
<ToolTipLabel label="Enabled">
190+
<CircleCheckIcon className="size-4 text-success-text" />
191+
</ToolTipLabel>
192+
) : (
193+
<ToolTipLabel label="Disabled">
194+
<XIcon className="size-4 text-destructive-text" />
195+
</ToolTipLabel>
196+
)
197+
) : eip7702Support.isError ? (
198+
<ToolTipLabel label="Disabled">
199+
<XIcon className="size-4 text-destructive-text" />
200+
</ToolTipLabel>
201+
) : null
202+
}
203+
>
204+
{eip7702Support.data ? (
205+
eip7702Support.data.isSupported ? (
206+
"Enabled"
207+
) : (
208+
"Disabled"
209+
)
210+
) : eip7702Support.isError ? (
211+
"Disabled"
131212
) : (
132-
<div className="flex h-[28px] w-[140px] py-1">
213+
<div className="flex h-[28px] w-[80px] py-1">
133214
<Skeleton className="h-full w-full" />
134215
</div>
135216
)}

‎apps/portal/src/app/typescript/v5/connecting-wallets/page.mdx‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,6 @@ import { createWallet, injectedProvider } from "thirdweb/wallets";
4141
const client = createThirdwebClient({ clientId });
4242

4343
const metamask = createWallet("io.metamask"); // pass the wallet id
44-
45-
// if user has metamask installed, connect to it
46-
if (injectedProvider("io.metamask")) {
47-
await metamask.connect({ client });
48-
}
49-
50-
// open wallet connect modal so user can scan the QR code and connect
51-
else {
52-
await metamask.connect({ client, walletConnect: { showQrModal: true } });
53-
}
44+
// if user has metamask installed, connect to it, otherwise opens a WalletConnect modal
45+
await metamask.connect({ client });
5446
```

‎apps/portal/src/app/wallets/external-wallets/[walletId]/page.tsx‎

Lines changed: 12 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -188,16 +188,7 @@ import { createWallet, injectedProvider } from "thirdweb/wallets";
188188
const client = createThirdwebClient({ clientId });
189189
190190
const wallet = createWallet("${id}"); // pass the wallet id
191-
192-
// if the wallet extension is installed, connect to it
193-
if (injectedProvider("${id}")) {
194-
await wallet.connect({ client });
195-
}
196-
197-
// show error message to user that wallet is not installed
198-
else {
199-
alert('wallet is not installed');
200-
}
191+
await wallet.connect({ client });
201192
`;
202193
}
203194

@@ -209,12 +200,7 @@ import { createWallet } from "thirdweb/wallets";
209200
const client = createThirdwebClient({ clientId });
210201
211202
const wallet = createWallet("${id}"); // pass the wallet id
212-
213-
// open WalletConnect modal so user can scan the QR code and connect
214-
await wallet.connect({
215-
client,
216-
walletConnect: { showQrModal: true },
217-
});
203+
await wallet.connect({ client });
218204
`;
219205
}
220206

@@ -226,19 +212,8 @@ import { createWallet, injectedProvider } from "thirdweb/wallets";
226212
const client = createThirdwebClient({ clientId });
227213
228214
const wallet = createWallet("${id}"); // pass the wallet id
229-
230-
// if user has wallet installed, connect to it
231-
if (injectedProvider("${id}")) {
232-
await wallet.connect({ client });
233-
}
234-
235-
// open WalletConnect modal so user can scan the QR code and connect
236-
else {
237-
await wallet.connect({
238-
client,
239-
walletConnect: { showQrModal: true },
240-
});
241-
}
215+
// if user has wallet installed, connects to it, otherwise opens a WalletConnect modal
216+
await wallet.connect({ client });
242217
`;
243218
}
244219

@@ -257,20 +232,7 @@ function Example() {
257232
onClick={() =>
258233
connect(async () => {
259234
const wallet = createWallet("${id}"); // pass the wallet id
260-
261-
// if user has wallet installed, connect to it
262-
if (injectedProvider("${id}")) {
263-
await wallet.connect({ client });
264-
}
265-
266-
// open WalletConnect modal so user can scan the QR code and connect
267-
else {
268-
await wallet.connect({
269-
client,
270-
walletConnect: { showQrModal: true },
271-
});
272-
}
273-
235+
await wallet.connect({ client });
274236
// return the wallet to set it as active wallet
275237
return wallet;
276238
})
@@ -298,13 +260,7 @@ function Example() {
298260
onClick={() =>
299261
connect(async () => {
300262
const wallet = createWallet("${id}"); // pass the wallet id
301-
302-
// open WalletConnect modal so user can scan the QR code and connect
303-
await wallet.connect({
304-
client,
305-
walletConnect: { showQrModal: true },
306-
});
307-
263+
await wallet.connect({ client });
308264
// return the wallet to set it as active wallet
309265
return wallet;
310266
})
@@ -330,19 +286,12 @@ function Example() {
330286
return (
331287
<button
332288
onClick={() => {
333-
// if the wallet extension is installed, connect to it
334-
if (injectedProvider("${id}")) {
335-
connect(async () => {
336-
const wallet = createWallet("${id}");
337-
await wallet.connect({ client });
338-
return wallet;
339-
});
340-
}
341-
342-
// show error message to user that wallet is not installed
343-
else {
344-
alert("wallet is not installed");
345-
}
289+
// if the wallet extension is installed, connect to it, otherwise opens a WalletConnect modal
290+
connect(async () => {
291+
const wallet = createWallet("${id}");
292+
await wallet.connect({ client });
293+
return wallet;
294+
});
346295
}}
347296
>
348297
{isConnecting ? "Connecting..." : "Connect"}

0 commit comments

Comments
 (0)