thirdweb 5.80.1-nightly-a3f59e50e249d8b4fac765e025fc2cd102093e9c-20250105000328 → 5.80.1-nightly-430475913d30ef7a30cb3092f6ef09c0c998a9b6-20250106000343
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/contract/actions/compiler-metadata.js.map +1 -1
- package/dist/cjs/react/core/hooks/wallets/useAutoConnect.js +28 -9
- package/dist/cjs/react/core/hooks/wallets/useAutoConnect.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/cjs/wallets/injected/index.js +2 -1
- package/dist/cjs/wallets/injected/index.js.map +1 -1
- package/dist/esm/contract/actions/compiler-metadata.js.map +1 -1
- package/dist/esm/react/core/hooks/wallets/useAutoConnect.js +27 -9
- package/dist/esm/react/core/hooks/wallets/useAutoConnect.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/esm/wallets/injected/index.js +2 -1
- package/dist/esm/wallets/injected/index.js.map +1 -1
- package/dist/types/contract/actions/compiler-metadata.d.ts +9 -0
- package/dist/types/contract/actions/compiler-metadata.d.ts.map +1 -1
- package/dist/types/react/core/hooks/connection/types.d.ts +4 -0
- package/dist/types/react/core/hooks/connection/types.d.ts.map +1 -1
- package/dist/types/react/core/hooks/wallets/useAutoConnect.d.ts +12 -0
- package/dist/types/react/core/hooks/wallets/useAutoConnect.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 +1 -1
- package/src/adapters/eip1193/from-eip1193.test.ts +18 -0
- package/src/contract/actions/compiler-metadata.ts +5 -0
- package/src/react/core/hooks/connection/types.ts +5 -0
- package/src/react/core/hooks/wallets/useAutoConnect.ts +41 -12
- package/src/react/core/hooks/wallets/useAutoConnectCore.test.tsx +187 -0
- package/src/version.ts +1 -1
- package/src/wallets/in-app/web/lib/get-url-token.test.tsx +92 -0
- package/src/wallets/injected/index.ts +2 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compiler-metadata.js","sourceRoot":"","sources":["../../../../src/contract/actions/compiler-metadata.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"compiler-metadata.js","sourceRoot":"","sources":["../../../../src/contract/actions/compiler-metadata.ts"],"names":[],"mappings":";;AAkCA,wDAgCC;AAtCD;;;;;GAKG;AACH,SAAgB,sBAAsB;AACpC,8DAA8D;AAC9D,QAAa;IAEb,IAAI,IAAI,GAAG,QAAQ,CAAC;IACpB,IAAI,iBAAiB,IAAI,QAAQ,EAAE,CAAC;QAClC,IAAI,GAAG,QAAQ,CAAC,eAAe,CAAC;IAClC,CAAC;IACD,MAAM,iBAAiB,GAAG,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC;IAC1D,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC/C,MAAM,IAAI,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAmC,CAAC,CAAC;IAC7E,MAAM,IAAI,GAAG;QACX,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK;QAC/B,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM;QACjC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM;QAClC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM;KACnC,CAAC;IACF,MAAM,QAAQ,GAAa;QACzB,GAAG,IAAI,GAAG;QACR,8DAA8D;QAC9D,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAE,GAAW,CAAC,OAAO,CAAC,CACpE;KACF,CAAC;IACF,OAAO;QACL,IAAI;QACJ,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE;QAC5B,QAAQ,EAAE,IAAI;QACd,IAAI;QACJ,QAAQ;QACR,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,UAAU,EAAE,QAAQ,CAAC,UAAU;KAChC,CAAC;AACJ,CAAC"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
"use client";
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
exports.useAutoConnectCore = useAutoConnectCore;
|
|
5
|
+
exports.handleWalletConnection = handleWalletConnection;
|
|
5
6
|
const react_query_1 = require("@tanstack/react-query");
|
|
6
7
|
const is_ecosystem_wallet_js_1 = require("../../../../wallets/ecosystem/is-ecosystem-wallet.js");
|
|
7
8
|
const client_scoped_storage_js_1 = require("../../../../wallets/in-app/core/authentication/client-scoped-storage.js");
|
|
@@ -64,13 +65,6 @@ function useAutoConnectCore(storage, props, createWalletFn, getInstalledWallets)
|
|
|
64
65
|
// this flow can actually be used for a first connection in the case of a redirect
|
|
65
66
|
// in that case, we default to the passed chain to connect to
|
|
66
67
|
const lastConnectedChain = (await (0, index_js_1.getLastConnectedChain)(storage)) || props.chain;
|
|
67
|
-
async function handleWalletConnection(wallet) {
|
|
68
|
-
return wallet.autoConnect({
|
|
69
|
-
client: props.client,
|
|
70
|
-
chain: lastConnectedChain ?? undefined,
|
|
71
|
-
authResult,
|
|
72
|
-
});
|
|
73
|
-
}
|
|
74
68
|
const availableWallets = [...wallets, ...(getInstalledWallets?.() ?? [])];
|
|
75
69
|
const activeWallet = lastActiveWalletId &&
|
|
76
70
|
(availableWallets.find((w) => w.id === lastActiveWalletId) ||
|
|
@@ -78,9 +72,19 @@ function useAutoConnectCore(storage, props, createWalletFn, getInstalledWallets)
|
|
|
78
72
|
if (activeWallet) {
|
|
79
73
|
try {
|
|
80
74
|
setConnectionStatus("connecting"); // only set connecting status if we are connecting the last active EOA
|
|
81
|
-
await (0, timeoutPromise_js_1.timeoutPromise)(handleWalletConnection(
|
|
75
|
+
await (0, timeoutPromise_js_1.timeoutPromise)(handleWalletConnection({
|
|
76
|
+
wallet: activeWallet,
|
|
77
|
+
client: props.client,
|
|
78
|
+
lastConnectedChain,
|
|
79
|
+
authResult,
|
|
80
|
+
}), {
|
|
82
81
|
ms: timeout,
|
|
83
82
|
message: `AutoConnect timeout: ${timeout}ms limit exceeded.`,
|
|
83
|
+
}).catch((err) => {
|
|
84
|
+
console.warn(err.message);
|
|
85
|
+
if (props.onTimeout) {
|
|
86
|
+
props.onTimeout();
|
|
87
|
+
}
|
|
84
88
|
});
|
|
85
89
|
// connected wallet could be activeWallet or smart wallet
|
|
86
90
|
const connectedWallet = await connect(activeWallet);
|
|
@@ -113,7 +117,12 @@ function useAutoConnectCore(storage, props, createWalletFn, getInstalledWallets)
|
|
|
113
117
|
const otherWallets = availableWallets.filter((w) => w.id !== lastActiveWalletId && lastConnectedWalletIds.includes(w.id));
|
|
114
118
|
for (const wallet of otherWallets) {
|
|
115
119
|
try {
|
|
116
|
-
await handleWalletConnection(
|
|
120
|
+
await handleWalletConnection({
|
|
121
|
+
wallet,
|
|
122
|
+
client: props.client,
|
|
123
|
+
lastConnectedChain,
|
|
124
|
+
authResult,
|
|
125
|
+
});
|
|
117
126
|
manager.addConnectedWallet(wallet);
|
|
118
127
|
}
|
|
119
128
|
catch {
|
|
@@ -132,4 +141,14 @@ function useAutoConnectCore(storage, props, createWalletFn, getInstalledWallets)
|
|
|
132
141
|
});
|
|
133
142
|
return query;
|
|
134
143
|
}
|
|
144
|
+
/**
|
|
145
|
+
* @internal
|
|
146
|
+
*/
|
|
147
|
+
async function handleWalletConnection(props) {
|
|
148
|
+
return props.wallet.autoConnect({
|
|
149
|
+
client: props.client,
|
|
150
|
+
chain: props.lastConnectedChain,
|
|
151
|
+
authResult: props.authResult,
|
|
152
|
+
});
|
|
153
|
+
}
|
|
135
154
|
//# sourceMappingURL=useAutoConnect.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAutoConnect.js","sourceRoot":"","sources":["../../../../../../src/react/core/hooks/wallets/useAutoConnect.ts"],"names":[],"mappings":";AAAA,YAAY,CAAC;;
|
|
1
|
+
{"version":3,"file":"useAutoConnect.js","sourceRoot":"","sources":["../../../../../../src/react/core/hooks/wallets/useAutoConnect.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/version.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.version = void 0;
|
|
4
|
-
exports.version = "5.80.1-nightly-
|
|
4
|
+
exports.version = "5.80.1-nightly-430475913d30ef7a30cb3092f6ef09c0c998a9b6-20250106000343";
|
|
5
5
|
//# sourceMappingURL=version.js.map
|
|
@@ -52,7 +52,8 @@ async function connectEip1193Wallet({ id, provider, emitter, client, chain, }) {
|
|
|
52
52
|
.then(normalizeChainId_js_1.normalizeChainId);
|
|
53
53
|
let connectedChain = chain && chain.id === chainId ? chain : (0, utils_js_1.getCachedChain)(chainId);
|
|
54
54
|
// if we want a specific chainId and it is not the same as the provider chainId, trigger switchChain
|
|
55
|
-
|
|
55
|
+
// we check for undefined chain ID since some chain-specific wallets like Abstract will not send a chain ID on connection
|
|
56
|
+
if (chain && typeof chain.id !== "undefined" && chain.id !== chainId) {
|
|
56
57
|
await switchChain(provider, chain);
|
|
57
58
|
connectedChain = chain;
|
|
58
59
|
}
|
|
@@ -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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compiler-metadata.js","sourceRoot":"","sources":["../../../../src/contract/actions/compiler-metadata.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"compiler-metadata.js","sourceRoot":"","sources":["../../../../src/contract/actions/compiler-metadata.ts"],"names":[],"mappings":"AA4BA;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB;AACpC,8DAA8D;AAC9D,QAAa;IAEb,IAAI,IAAI,GAAG,QAAQ,CAAC;IACpB,IAAI,iBAAiB,IAAI,QAAQ,EAAE,CAAC;QAClC,IAAI,GAAG,QAAQ,CAAC,eAAe,CAAC;IAClC,CAAC;IACD,MAAM,iBAAiB,GAAG,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC;IAC1D,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC/C,MAAM,IAAI,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAmC,CAAC,CAAC;IAC7E,MAAM,IAAI,GAAG;QACX,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK;QAC/B,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM;QACjC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM;QAClC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM;KACnC,CAAC;IACF,MAAM,QAAQ,GAAa;QACzB,GAAG,IAAI,GAAG;QACR,8DAA8D;QAC9D,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAE,GAAW,CAAC,OAAO,CAAC,CACpE;KACF,CAAC;IACF,OAAO;QACL,IAAI;QACJ,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE;QAC5B,QAAQ,EAAE,IAAI;QACd,IAAI;QACJ,QAAQ;QACR,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,UAAU,EAAE,QAAQ,CAAC,UAAU;KAChC,CAAC;AACJ,CAAC"}
|
|
@@ -61,13 +61,6 @@ export function useAutoConnectCore(storage, props, createWalletFn, getInstalledW
|
|
|
61
61
|
// this flow can actually be used for a first connection in the case of a redirect
|
|
62
62
|
// in that case, we default to the passed chain to connect to
|
|
63
63
|
const lastConnectedChain = (await getLastConnectedChain(storage)) || props.chain;
|
|
64
|
-
async function handleWalletConnection(wallet) {
|
|
65
|
-
return wallet.autoConnect({
|
|
66
|
-
client: props.client,
|
|
67
|
-
chain: lastConnectedChain ?? undefined,
|
|
68
|
-
authResult,
|
|
69
|
-
});
|
|
70
|
-
}
|
|
71
64
|
const availableWallets = [...wallets, ...(getInstalledWallets?.() ?? [])];
|
|
72
65
|
const activeWallet = lastActiveWalletId &&
|
|
73
66
|
(availableWallets.find((w) => w.id === lastActiveWalletId) ||
|
|
@@ -75,9 +68,19 @@ export function useAutoConnectCore(storage, props, createWalletFn, getInstalledW
|
|
|
75
68
|
if (activeWallet) {
|
|
76
69
|
try {
|
|
77
70
|
setConnectionStatus("connecting"); // only set connecting status if we are connecting the last active EOA
|
|
78
|
-
await timeoutPromise(handleWalletConnection(
|
|
71
|
+
await timeoutPromise(handleWalletConnection({
|
|
72
|
+
wallet: activeWallet,
|
|
73
|
+
client: props.client,
|
|
74
|
+
lastConnectedChain,
|
|
75
|
+
authResult,
|
|
76
|
+
}), {
|
|
79
77
|
ms: timeout,
|
|
80
78
|
message: `AutoConnect timeout: ${timeout}ms limit exceeded.`,
|
|
79
|
+
}).catch((err) => {
|
|
80
|
+
console.warn(err.message);
|
|
81
|
+
if (props.onTimeout) {
|
|
82
|
+
props.onTimeout();
|
|
83
|
+
}
|
|
81
84
|
});
|
|
82
85
|
// connected wallet could be activeWallet or smart wallet
|
|
83
86
|
const connectedWallet = await connect(activeWallet);
|
|
@@ -110,7 +113,12 @@ export function useAutoConnectCore(storage, props, createWalletFn, getInstalledW
|
|
|
110
113
|
const otherWallets = availableWallets.filter((w) => w.id !== lastActiveWalletId && lastConnectedWalletIds.includes(w.id));
|
|
111
114
|
for (const wallet of otherWallets) {
|
|
112
115
|
try {
|
|
113
|
-
await handleWalletConnection(
|
|
116
|
+
await handleWalletConnection({
|
|
117
|
+
wallet,
|
|
118
|
+
client: props.client,
|
|
119
|
+
lastConnectedChain,
|
|
120
|
+
authResult,
|
|
121
|
+
});
|
|
114
122
|
manager.addConnectedWallet(wallet);
|
|
115
123
|
}
|
|
116
124
|
catch {
|
|
@@ -129,4 +137,14 @@ export function useAutoConnectCore(storage, props, createWalletFn, getInstalledW
|
|
|
129
137
|
});
|
|
130
138
|
return query;
|
|
131
139
|
}
|
|
140
|
+
/**
|
|
141
|
+
* @internal
|
|
142
|
+
*/
|
|
143
|
+
export async function handleWalletConnection(props) {
|
|
144
|
+
return props.wallet.autoConnect({
|
|
145
|
+
client: props.client,
|
|
146
|
+
chain: props.lastConnectedChain,
|
|
147
|
+
authResult: props.authResult,
|
|
148
|
+
});
|
|
149
|
+
}
|
|
132
150
|
//# sourceMappingURL=useAutoConnect.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAutoConnect.js","sourceRoot":"","sources":["../../../../../../src/react/core/hooks/wallets/useAutoConnect.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"useAutoConnect.js","sourceRoot":"","sources":["../../../../../../src/react/core/hooks/wallets/useAutoConnect.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = "5.80.1-nightly-
|
|
1
|
+
export const version = "5.80.1-nightly-430475913d30ef7a30cb3092f6ef09c0c998a9b6-20250106000343";
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
|
@@ -47,7 +47,8 @@ export async function connectEip1193Wallet({ id, provider, emitter, client, chai
|
|
|
47
47
|
.then(normalizeChainId);
|
|
48
48
|
let connectedChain = chain && chain.id === chainId ? chain : getCachedChain(chainId);
|
|
49
49
|
// if we want a specific chainId and it is not the same as the provider chainId, trigger switchChain
|
|
50
|
-
|
|
50
|
+
// we check for undefined chain ID since some chain-specific wallets like Abstract will not send a chain ID on connection
|
|
51
|
+
if (chain && typeof chain.id !== "undefined" && chain.id !== chainId) {
|
|
51
52
|
await switchChain(provider, chain);
|
|
52
53
|
connectedChain = chain;
|
|
53
54
|
}
|
|
@@ -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;IAE1B,IAAI,cAAc,GAChB,KAAK,IAAI,KAAK,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAElE,oGAAoG;IACpG,IAAI,KAAK,IAAI,KAAK,CAAC,EAAE,KAAK,OAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/wallets/injected/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,15 @@ export type CompilerMetadata = {
|
|
|
11
11
|
} | {
|
|
12
12
|
urls: string[];
|
|
13
13
|
}>;
|
|
14
|
+
output: {
|
|
15
|
+
abi: Abi;
|
|
16
|
+
devdoc?: Record<string, Record<string, {
|
|
17
|
+
details: string;
|
|
18
|
+
}>>;
|
|
19
|
+
userdoc?: Record<string, Record<string, {
|
|
20
|
+
notice: string;
|
|
21
|
+
}>>;
|
|
22
|
+
};
|
|
14
23
|
};
|
|
15
24
|
info: {
|
|
16
25
|
title?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compiler-metadata.d.ts","sourceRoot":"","sources":["../../../../src/contract/actions/compiler-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC;AAEnC;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,GAAG,CAAC;IAET,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG;QAC9B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE;YAAE,OAAO,EAAE,MAAM,CAAA;SAAE,GAAG;YAAE,IAAI,EAAE,MAAM,EAAE,CAAA;SAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"compiler-metadata.d.ts","sourceRoot":"","sources":["../../../../src/contract/actions/compiler-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC;AAEnC;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,GAAG,CAAC;IAET,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG;QAC9B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE;YAAE,OAAO,EAAE,MAAM,CAAA;SAAE,GAAG;YAAE,IAAI,EAAE,MAAM,EAAE,CAAA;SAAE,CAAC,CAAC;QAClE,MAAM,EAAE;YACN,GAAG,EAAE,GAAG,CAAC;YACT,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;gBAAE,OAAO,EAAE,MAAM,CAAA;aAAE,CAAC,CAAC,CAAC;YAC7D,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;gBAAE,MAAM,EAAE,MAAM,CAAA;aAAE,CAAC,CAAC,CAAC;SAC9D,CAAC;KACH,CAAC;IACF,IAAI,EAAE;QACJ,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAEpC,QAAQ,EAAE,GAAG,GACZ,gBAAgB,CA6BlB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/react/core/hooks/connection/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AACvE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAEhE,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB;;;;;;;;;;;;;;OAcG;IACH,MAAM,EAAE,cAAc,CAAC;IAEvB;;;;;;;;;;;;;OAaG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;IAE1B;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;;;;;;;;;OAaG;IACH,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IAExC;;;;;;;;;;OAUG;IACH,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAErC;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/react/core/hooks/connection/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AACvE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAEhE,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB;;;;;;;;;;;;;;OAcG;IACH,MAAM,EAAE,cAAc,CAAC;IAEvB;;;;;;;;;;;;;OAaG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;IAE1B;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;;;;;;;;;OAaG;IACH,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IAExC;;;;;;;;;;OAUG;IACH,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAErC;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC;IAEd;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;CACxB,CAAC"}
|
|
@@ -1,8 +1,20 @@
|
|
|
1
|
+
import type { Chain } from "../../../../chains/types.js";
|
|
2
|
+
import type { ThirdwebClient } from "../../../../client/client.js";
|
|
1
3
|
import type { AsyncStorage } from "../../../../utils/storage/AsyncStorage.js";
|
|
4
|
+
import type { AuthStoredTokenWithCookieReturnType } from "../../../../wallets/in-app/core/authentication/types.js";
|
|
2
5
|
import type { Wallet } from "../../../../wallets/interfaces/wallet.js";
|
|
3
6
|
import type { WalletId } from "../../../../wallets/wallet-types.js";
|
|
4
7
|
import type { AutoConnectProps } from "../connection/types.js";
|
|
5
8
|
export declare function useAutoConnectCore(storage: AsyncStorage, props: AutoConnectProps & {
|
|
6
9
|
wallets: Wallet[];
|
|
7
10
|
}, createWalletFn: (id: WalletId) => Wallet, getInstalledWallets?: () => Wallet[]): import("@tanstack/react-query").UseQueryResult<boolean, Error>;
|
|
11
|
+
/**
|
|
12
|
+
* @internal
|
|
13
|
+
*/
|
|
14
|
+
export declare function handleWalletConnection(props: {
|
|
15
|
+
wallet: Wallet;
|
|
16
|
+
client: ThirdwebClient;
|
|
17
|
+
authResult: AuthStoredTokenWithCookieReturnType | undefined;
|
|
18
|
+
lastConnectedChain: Chain | undefined;
|
|
19
|
+
}): Promise<import("../../../../wallets/interfaces/wallet.js").Account>;
|
|
8
20
|
//# sourceMappingURL=useAutoConnect.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAutoConnect.d.ts","sourceRoot":"","sources":["../../../../../../src/react/core/hooks/wallets/useAutoConnect.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"useAutoConnect.d.ts","sourceRoot":"","sources":["../../../../../../src/react/core/hooks/wallets/useAutoConnect.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AAG9E,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,yDAAyD,CAAC;AAEnH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AAMvE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAIpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAI/D,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,YAAY,EACrB,KAAK,EAAE,gBAAgB,GAAG;IAAE,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,EAC/C,cAAc,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,MAAM,EACxC,mBAAmB,CAAC,EAAE,MAAM,MAAM,EAAE,kEAgJrC;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAAC,KAAK,EAAE;IAClD,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,cAAc,CAAC;IACvB,UAAU,EAAE,mCAAmC,GAAG,SAAS,CAAC;IAC5D,kBAAkB,EAAE,KAAK,GAAG,SAAS,CAAC;CACvC,uEAMA"}
|
package/dist/types/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "5.80.1-nightly-
|
|
1
|
+
export declare const version = "5.80.1-nightly-430475913d30ef7a30cb3092f6ef09c0c998a9b6-20250106000343";
|
|
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,CAgDxC;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.80.1-nightly-
|
|
3
|
+
"version": "5.80.1-nightly-430475913d30ef7a30cb3092f6ef09c0c998a9b6-20250106000343",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "git+https://github.com/thirdweb-dev/js.git#main"
|
|
@@ -115,6 +115,24 @@ describe("fromProvider", () => {
|
|
|
115
115
|
expect(chain).toBe(ANVIL_CHAIN);
|
|
116
116
|
});
|
|
117
117
|
|
|
118
|
+
test("should handle connection with no chainId", async () => {
|
|
119
|
+
const wallet = fromProvider({
|
|
120
|
+
provider: {
|
|
121
|
+
...mockProvider,
|
|
122
|
+
request: () => Promise.resolve([mockAccount.address]),
|
|
123
|
+
},
|
|
124
|
+
});
|
|
125
|
+
|
|
126
|
+
await wallet.connect({
|
|
127
|
+
client: TEST_CLIENT,
|
|
128
|
+
chain: {
|
|
129
|
+
...ANVIL_CHAIN,
|
|
130
|
+
id: undefined,
|
|
131
|
+
// biome-ignore lint/suspicious/noExplicitAny: Testing unexpected input data
|
|
132
|
+
} as any,
|
|
133
|
+
});
|
|
134
|
+
});
|
|
135
|
+
|
|
118
136
|
test("should reset state on disconnect", async () => {
|
|
119
137
|
const wallet = fromProvider({
|
|
120
138
|
provider: {
|
|
@@ -9,6 +9,11 @@ export type CompilerMetadata = {
|
|
|
9
9
|
// biome-ignore lint/suspicious/noExplicitAny: TODO: fix later by updating this type to match the specs here: https://docs.soliditylang.org/en/latest/metadata.html
|
|
10
10
|
metadata: Record<string, any> & {
|
|
11
11
|
sources: Record<string, { content: string } | { urls: string[] }>;
|
|
12
|
+
output: {
|
|
13
|
+
abi: Abi;
|
|
14
|
+
devdoc?: Record<string, Record<string, { details: string }>>;
|
|
15
|
+
userdoc?: Record<string, Record<string, { notice: string }>>;
|
|
16
|
+
};
|
|
12
17
|
};
|
|
13
18
|
info: {
|
|
14
19
|
title?: string;
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
"use client";
|
|
2
2
|
|
|
3
3
|
import { useQuery } from "@tanstack/react-query";
|
|
4
|
+
import type { Chain } from "../../../../chains/types.js";
|
|
5
|
+
import type { ThirdwebClient } from "../../../../client/client.js";
|
|
4
6
|
import type { AsyncStorage } from "../../../../utils/storage/AsyncStorage.js";
|
|
5
7
|
import { isEcosystemWallet } from "../../../../wallets/ecosystem/is-ecosystem-wallet.js";
|
|
6
8
|
import { ClientScopedStorage } from "../../../../wallets/in-app/core/authentication/client-scoped-storage.js";
|
|
9
|
+
import type { AuthStoredTokenWithCookieReturnType } from "../../../../wallets/in-app/core/authentication/types.js";
|
|
7
10
|
import { getUrlToken } from "../../../../wallets/in-app/web/lib/get-url-token.js";
|
|
8
11
|
import type { Wallet } from "../../../../wallets/interfaces/wallet.js";
|
|
9
12
|
import {
|
|
@@ -83,14 +86,6 @@ export function useAutoConnectCore(
|
|
|
83
86
|
const lastConnectedChain =
|
|
84
87
|
(await getLastConnectedChain(storage)) || props.chain;
|
|
85
88
|
|
|
86
|
-
async function handleWalletConnection(wallet: Wallet) {
|
|
87
|
-
return wallet.autoConnect({
|
|
88
|
-
client: props.client,
|
|
89
|
-
chain: lastConnectedChain ?? undefined,
|
|
90
|
-
authResult,
|
|
91
|
-
});
|
|
92
|
-
}
|
|
93
|
-
|
|
94
89
|
const availableWallets = [...wallets, ...(getInstalledWallets?.() ?? [])];
|
|
95
90
|
const activeWallet =
|
|
96
91
|
lastActiveWalletId &&
|
|
@@ -100,9 +95,22 @@ export function useAutoConnectCore(
|
|
|
100
95
|
if (activeWallet) {
|
|
101
96
|
try {
|
|
102
97
|
setConnectionStatus("connecting"); // only set connecting status if we are connecting the last active EOA
|
|
103
|
-
await timeoutPromise(
|
|
104
|
-
|
|
105
|
-
|
|
98
|
+
await timeoutPromise(
|
|
99
|
+
handleWalletConnection({
|
|
100
|
+
wallet: activeWallet,
|
|
101
|
+
client: props.client,
|
|
102
|
+
lastConnectedChain,
|
|
103
|
+
authResult,
|
|
104
|
+
}),
|
|
105
|
+
{
|
|
106
|
+
ms: timeout,
|
|
107
|
+
message: `AutoConnect timeout: ${timeout}ms limit exceeded.`,
|
|
108
|
+
},
|
|
109
|
+
).catch((err) => {
|
|
110
|
+
console.warn(err.message);
|
|
111
|
+
if (props.onTimeout) {
|
|
112
|
+
props.onTimeout();
|
|
113
|
+
}
|
|
106
114
|
});
|
|
107
115
|
|
|
108
116
|
// connected wallet could be activeWallet or smart wallet
|
|
@@ -138,7 +146,12 @@ export function useAutoConnectCore(
|
|
|
138
146
|
|
|
139
147
|
for (const wallet of otherWallets) {
|
|
140
148
|
try {
|
|
141
|
-
await handleWalletConnection(
|
|
149
|
+
await handleWalletConnection({
|
|
150
|
+
wallet,
|
|
151
|
+
client: props.client,
|
|
152
|
+
lastConnectedChain,
|
|
153
|
+
authResult,
|
|
154
|
+
});
|
|
142
155
|
manager.addConnectedWallet(wallet);
|
|
143
156
|
} catch {
|
|
144
157
|
// no-op
|
|
@@ -158,3 +171,19 @@ export function useAutoConnectCore(
|
|
|
158
171
|
|
|
159
172
|
return query;
|
|
160
173
|
}
|
|
174
|
+
|
|
175
|
+
/**
|
|
176
|
+
* @internal
|
|
177
|
+
*/
|
|
178
|
+
export async function handleWalletConnection(props: {
|
|
179
|
+
wallet: Wallet;
|
|
180
|
+
client: ThirdwebClient;
|
|
181
|
+
authResult: AuthStoredTokenWithCookieReturnType | undefined;
|
|
182
|
+
lastConnectedChain: Chain | undefined;
|
|
183
|
+
}) {
|
|
184
|
+
return props.wallet.autoConnect({
|
|
185
|
+
client: props.client,
|
|
186
|
+
chain: props.lastConnectedChain,
|
|
187
|
+
authResult: props.authResult,
|
|
188
|
+
});
|
|
189
|
+
}
|
|
@@ -0,0 +1,187 @@
|
|
|
1
|
+
import { renderHook, waitFor } from "@testing-library/react";
|
|
2
|
+
import type { ReactNode } from "react";
|
|
3
|
+
import { describe, expect, it, vi } from "vitest";
|
|
4
|
+
import { MockStorage } from "~test/mocks/storage.js";
|
|
5
|
+
import { TEST_CLIENT } from "~test/test-clients.js";
|
|
6
|
+
import { TEST_ACCOUNT_A } from "~test/test-wallets.js";
|
|
7
|
+
import { createWalletAdapter } from "../../../../adapters/wallet-adapter.js";
|
|
8
|
+
import { ethereum } from "../../../../chains/chain-definitions/ethereum.js";
|
|
9
|
+
import { isAddress } from "../../../../utils/address.js";
|
|
10
|
+
import { createConnectionManager } from "../../../../wallets/manager/index.js";
|
|
11
|
+
import type { WalletId } from "../../../../wallets/wallet-types.js";
|
|
12
|
+
import { ThirdwebProvider } from "../../../web/providers/thirdweb-provider.js";
|
|
13
|
+
import { ConnectionManagerCtx } from "../../providers/connection-manager.js";
|
|
14
|
+
import {
|
|
15
|
+
handleWalletConnection,
|
|
16
|
+
useAutoConnectCore,
|
|
17
|
+
} from "./useAutoConnect.js";
|
|
18
|
+
|
|
19
|
+
describe("useAutoConnectCore", () => {
|
|
20
|
+
const mockStorage = new MockStorage();
|
|
21
|
+
const manager = createConnectionManager(mockStorage);
|
|
22
|
+
|
|
23
|
+
// Create a wrapper component with the mocked context
|
|
24
|
+
const wrapper = ({ children }: { children: ReactNode }) => {
|
|
25
|
+
return (
|
|
26
|
+
<ThirdwebProvider>
|
|
27
|
+
<ConnectionManagerCtx.Provider value={manager}>
|
|
28
|
+
{children}
|
|
29
|
+
</ConnectionManagerCtx.Provider>
|
|
30
|
+
</ThirdwebProvider>
|
|
31
|
+
);
|
|
32
|
+
};
|
|
33
|
+
|
|
34
|
+
it("should return a useQuery result", async () => {
|
|
35
|
+
const wallet = createWalletAdapter({
|
|
36
|
+
adaptedAccount: TEST_ACCOUNT_A,
|
|
37
|
+
client: TEST_CLIENT,
|
|
38
|
+
chain: ethereum,
|
|
39
|
+
onDisconnect: () => {},
|
|
40
|
+
switchChain: () => {},
|
|
41
|
+
});
|
|
42
|
+
const { result } = renderHook(
|
|
43
|
+
() =>
|
|
44
|
+
useAutoConnectCore(
|
|
45
|
+
mockStorage,
|
|
46
|
+
{
|
|
47
|
+
wallets: [wallet],
|
|
48
|
+
client: TEST_CLIENT,
|
|
49
|
+
},
|
|
50
|
+
(id: WalletId) =>
|
|
51
|
+
createWalletAdapter({
|
|
52
|
+
adaptedAccount: TEST_ACCOUNT_A,
|
|
53
|
+
client: TEST_CLIENT,
|
|
54
|
+
chain: ethereum,
|
|
55
|
+
onDisconnect: () => {
|
|
56
|
+
console.warn(id);
|
|
57
|
+
},
|
|
58
|
+
switchChain: () => {},
|
|
59
|
+
}),
|
|
60
|
+
),
|
|
61
|
+
{ wrapper },
|
|
62
|
+
);
|
|
63
|
+
expect("data" in result.current).toBeTruthy();
|
|
64
|
+
await waitFor(() => {
|
|
65
|
+
expect(typeof result.current.data).toBe("boolean");
|
|
66
|
+
});
|
|
67
|
+
});
|
|
68
|
+
|
|
69
|
+
it("should return `false` if there's no lastConnectedWalletIds", async () => {
|
|
70
|
+
const wallet = createWalletAdapter({
|
|
71
|
+
adaptedAccount: TEST_ACCOUNT_A,
|
|
72
|
+
client: TEST_CLIENT,
|
|
73
|
+
chain: ethereum,
|
|
74
|
+
onDisconnect: () => {},
|
|
75
|
+
switchChain: () => {},
|
|
76
|
+
});
|
|
77
|
+
const { result } = renderHook(
|
|
78
|
+
() =>
|
|
79
|
+
useAutoConnectCore(
|
|
80
|
+
mockStorage,
|
|
81
|
+
{
|
|
82
|
+
wallets: [wallet],
|
|
83
|
+
client: TEST_CLIENT,
|
|
84
|
+
},
|
|
85
|
+
(id: WalletId) =>
|
|
86
|
+
createWalletAdapter({
|
|
87
|
+
adaptedAccount: TEST_ACCOUNT_A,
|
|
88
|
+
client: TEST_CLIENT,
|
|
89
|
+
chain: ethereum,
|
|
90
|
+
onDisconnect: () => {
|
|
91
|
+
console.warn(id);
|
|
92
|
+
},
|
|
93
|
+
switchChain: () => {},
|
|
94
|
+
}),
|
|
95
|
+
),
|
|
96
|
+
{ wrapper },
|
|
97
|
+
);
|
|
98
|
+
await waitFor(
|
|
99
|
+
() => {
|
|
100
|
+
expect(result.current.data).toBe(false);
|
|
101
|
+
},
|
|
102
|
+
{ timeout: 1000 },
|
|
103
|
+
);
|
|
104
|
+
});
|
|
105
|
+
|
|
106
|
+
it("should call onTimeout on ... timeout", async () => {
|
|
107
|
+
const wallet = createWalletAdapter({
|
|
108
|
+
adaptedAccount: TEST_ACCOUNT_A,
|
|
109
|
+
client: TEST_CLIENT,
|
|
110
|
+
chain: ethereum,
|
|
111
|
+
onDisconnect: () => {},
|
|
112
|
+
switchChain: () => {},
|
|
113
|
+
});
|
|
114
|
+
mockStorage.setItem("thirdweb:active-wallet-id", wallet.id);
|
|
115
|
+
const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
|
|
116
|
+
const infoSpy = vi.spyOn(console, "info").mockImplementation(() => {});
|
|
117
|
+
// Purposefully mock the wallet.autoConnect method to test the timeout logic
|
|
118
|
+
wallet.autoConnect = () =>
|
|
119
|
+
new Promise((resolve) => {
|
|
120
|
+
setTimeout(() => {
|
|
121
|
+
// @ts-ignore Mock purpose
|
|
122
|
+
resolve("Connection successful");
|
|
123
|
+
}, 2100);
|
|
124
|
+
});
|
|
125
|
+
renderHook(
|
|
126
|
+
() =>
|
|
127
|
+
useAutoConnectCore(
|
|
128
|
+
mockStorage,
|
|
129
|
+
{
|
|
130
|
+
wallets: [wallet],
|
|
131
|
+
client: TEST_CLIENT,
|
|
132
|
+
onTimeout: () => console.info("TIMEOUTTED"),
|
|
133
|
+
timeout: 0,
|
|
134
|
+
},
|
|
135
|
+
(id: WalletId) =>
|
|
136
|
+
createWalletAdapter({
|
|
137
|
+
adaptedAccount: TEST_ACCOUNT_A,
|
|
138
|
+
client: TEST_CLIENT,
|
|
139
|
+
chain: ethereum,
|
|
140
|
+
onDisconnect: () => {
|
|
141
|
+
console.warn(id);
|
|
142
|
+
},
|
|
143
|
+
switchChain: () => {},
|
|
144
|
+
}),
|
|
145
|
+
),
|
|
146
|
+
{ wrapper },
|
|
147
|
+
);
|
|
148
|
+
await waitFor(
|
|
149
|
+
() => {
|
|
150
|
+
expect(warnSpy).toHaveBeenCalled();
|
|
151
|
+
expect(warnSpy).toHaveBeenCalledWith(
|
|
152
|
+
"AutoConnect timeout: 0ms limit exceeded.",
|
|
153
|
+
);
|
|
154
|
+
expect(infoSpy).toHaveBeenCalled();
|
|
155
|
+
expect(infoSpy).toHaveBeenCalledWith("TIMEOUTTED");
|
|
156
|
+
warnSpy.mockRestore();
|
|
157
|
+
},
|
|
158
|
+
{ timeout: 2000 },
|
|
159
|
+
);
|
|
160
|
+
});
|
|
161
|
+
});
|
|
162
|
+
|
|
163
|
+
describe("handleWalletConnection", () => {
|
|
164
|
+
const wallet = createWalletAdapter({
|
|
165
|
+
adaptedAccount: TEST_ACCOUNT_A,
|
|
166
|
+
client: TEST_CLIENT,
|
|
167
|
+
chain: ethereum,
|
|
168
|
+
onDisconnect: () => {},
|
|
169
|
+
switchChain: () => {},
|
|
170
|
+
});
|
|
171
|
+
it("should return the correct result", async () => {
|
|
172
|
+
const result = await handleWalletConnection({
|
|
173
|
+
client: TEST_CLIENT,
|
|
174
|
+
lastConnectedChain: ethereum,
|
|
175
|
+
authResult: undefined,
|
|
176
|
+
wallet,
|
|
177
|
+
});
|
|
178
|
+
|
|
179
|
+
expect("address" in result).toBe(true);
|
|
180
|
+
expect(isAddress(result.address)).toBe(true);
|
|
181
|
+
expect("sendTransaction" in result).toBe(true);
|
|
182
|
+
expect(typeof result.sendTransaction).toBe("function");
|
|
183
|
+
expect("signMessage" in result).toBe(true);
|
|
184
|
+
expect("signTypedData" in result).toBe(true);
|
|
185
|
+
expect("signTransaction" in result).toBe(true);
|
|
186
|
+
});
|
|
187
|
+
});
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = "5.80.1-nightly-
|
|
1
|
+
export const version = "5.80.1-nightly-430475913d30ef7a30cb3092f6ef09c0c998a9b6-20250106000343";
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
import { afterEach, beforeEach, describe, expect, it } from "vitest";
|
|
2
|
+
import { getUrlToken } from "./get-url-token.js";
|
|
3
|
+
|
|
4
|
+
describe("getUrlToken", () => {
|
|
5
|
+
let originalLocation: Location;
|
|
6
|
+
|
|
7
|
+
beforeEach(() => {
|
|
8
|
+
originalLocation = window.location;
|
|
9
|
+
|
|
10
|
+
Object.defineProperty(window, "location", {
|
|
11
|
+
value: {
|
|
12
|
+
...originalLocation,
|
|
13
|
+
search: "",
|
|
14
|
+
},
|
|
15
|
+
writable: true,
|
|
16
|
+
});
|
|
17
|
+
});
|
|
18
|
+
|
|
19
|
+
afterEach(() => {
|
|
20
|
+
// Restore the original location object after each test
|
|
21
|
+
Object.defineProperty(window, "location", {
|
|
22
|
+
value: originalLocation,
|
|
23
|
+
writable: true,
|
|
24
|
+
});
|
|
25
|
+
});
|
|
26
|
+
|
|
27
|
+
it("should return an empty object if not in web context", () => {
|
|
28
|
+
const originalWindow = window;
|
|
29
|
+
// biome-ignore lint/suspicious/noExplicitAny: Test
|
|
30
|
+
(global as any).window = undefined;
|
|
31
|
+
|
|
32
|
+
const result = getUrlToken();
|
|
33
|
+
// biome-ignore lint/suspicious/noExplicitAny: Test
|
|
34
|
+
(global as any).window = originalWindow;
|
|
35
|
+
|
|
36
|
+
expect(result).toEqual({});
|
|
37
|
+
});
|
|
38
|
+
|
|
39
|
+
it("should return an empty object if no parameters are present", () => {
|
|
40
|
+
const result = getUrlToken();
|
|
41
|
+
expect(result).toEqual({});
|
|
42
|
+
});
|
|
43
|
+
|
|
44
|
+
it("should parse walletId and authResult correctly", () => {
|
|
45
|
+
window.location.search =
|
|
46
|
+
"?walletId=123&authResult=%7B%22token%22%3A%22abc%22%7D";
|
|
47
|
+
|
|
48
|
+
const result = getUrlToken();
|
|
49
|
+
|
|
50
|
+
expect(result).toEqual({
|
|
51
|
+
walletId: "123",
|
|
52
|
+
authResult: { token: "abc" },
|
|
53
|
+
authProvider: null,
|
|
54
|
+
authCookie: null,
|
|
55
|
+
});
|
|
56
|
+
});
|
|
57
|
+
|
|
58
|
+
it("should handle authCookie and update URL correctly", () => {
|
|
59
|
+
window.location.search = "?walletId=123&authCookie=myCookie";
|
|
60
|
+
|
|
61
|
+
const result = getUrlToken();
|
|
62
|
+
|
|
63
|
+
expect(result).toEqual({
|
|
64
|
+
walletId: "123",
|
|
65
|
+
authResult: undefined,
|
|
66
|
+
authProvider: null,
|
|
67
|
+
authCookie: "myCookie",
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
// Check if URL has been updated correctly
|
|
71
|
+
expect(window.location.search).toBe("?walletId=123&authCookie=myCookie");
|
|
72
|
+
});
|
|
73
|
+
|
|
74
|
+
it("should handle all parameters correctly", () => {
|
|
75
|
+
window.location.search =
|
|
76
|
+
"?walletId=123&authResult=%7B%22token%22%3A%22xyz%22%7D&authProvider=provider1&authCookie=myCookie";
|
|
77
|
+
|
|
78
|
+
const result = getUrlToken();
|
|
79
|
+
|
|
80
|
+
expect(result).toEqual({
|
|
81
|
+
walletId: "123",
|
|
82
|
+
authResult: { token: "xyz" },
|
|
83
|
+
authProvider: "provider1",
|
|
84
|
+
authCookie: "myCookie",
|
|
85
|
+
});
|
|
86
|
+
|
|
87
|
+
// Check if URL has been updated correctly
|
|
88
|
+
expect(window.location.search).toBe(
|
|
89
|
+
"?walletId=123&authResult=%7B%22token%22%3A%22xyz%22%7D&authProvider=provider1&authCookie=myCookie",
|
|
90
|
+
);
|
|
91
|
+
});
|
|
92
|
+
});
|
|
@@ -85,7 +85,8 @@ export async function connectEip1193Wallet({
|
|
|
85
85
|
chain && chain.id === chainId ? chain : getCachedChain(chainId);
|
|
86
86
|
|
|
87
87
|
// if we want a specific chainId and it is not the same as the provider chainId, trigger switchChain
|
|
88
|
-
|
|
88
|
+
// we check for undefined chain ID since some chain-specific wallets like Abstract will not send a chain ID on connection
|
|
89
|
+
if (chain && typeof chain.id !== "undefined" && chain.id !== chainId) {
|
|
89
90
|
await switchChain(provider, chain);
|
|
90
91
|
connectedChain = chain;
|
|
91
92
|
}
|