thirdweb 5.64.3-nightly-ddec3dadcc260e0d4d0ed2b43c502e0915a14203-20241029000326 → 5.64.4-nightly-043ee925981bdc39649d30ad65d2fce922515ab0-20241030000335
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/exports/wallets.js.map +1 -1
- package/dist/cjs/react/core/utils/isSmartWallet.js +4 -2
- package/dist/cjs/react/core/utils/isSmartWallet.js.map +1 -1
- package/dist/cjs/react/web/wallets/shared/ConnectWalletSocialOptions.js +1 -1
- package/dist/cjs/react/web/wallets/shared/ConnectWalletSocialOptions.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/cjs/wallets/ecosystem/get-ecosystem-wallet-auth-options.js +23 -17
- package/dist/cjs/wallets/ecosystem/get-ecosystem-wallet-auth-options.js.map +1 -1
- package/dist/cjs/wallets/ecosystem/get-ecosystem-wallet-info.js +4 -13
- package/dist/cjs/wallets/ecosystem/get-ecosystem-wallet-info.js.map +1 -1
- package/dist/cjs/wallets/in-app/core/authentication/passkeys.js +5 -5
- package/dist/cjs/wallets/in-app/core/authentication/passkeys.js.map +1 -1
- package/dist/cjs/wallets/in-app/core/wallet/in-app-core.js +56 -4
- package/dist/cjs/wallets/in-app/core/wallet/in-app-core.js.map +1 -1
- package/dist/cjs/wallets/in-app/core/wallet/index.js +2 -50
- package/dist/cjs/wallets/in-app/core/wallet/index.js.map +1 -1
- package/dist/esm/exports/wallets.js.map +1 -1
- package/dist/esm/react/core/utils/isSmartWallet.js +4 -2
- package/dist/esm/react/core/utils/isSmartWallet.js.map +1 -1
- package/dist/esm/react/web/wallets/shared/ConnectWalletSocialOptions.js +2 -2
- package/dist/esm/react/web/wallets/shared/ConnectWalletSocialOptions.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/esm/wallets/ecosystem/get-ecosystem-wallet-auth-options.js +22 -16
- package/dist/esm/wallets/ecosystem/get-ecosystem-wallet-auth-options.js.map +1 -1
- package/dist/esm/wallets/ecosystem/get-ecosystem-wallet-info.js +4 -13
- package/dist/esm/wallets/ecosystem/get-ecosystem-wallet-info.js.map +1 -1
- package/dist/esm/wallets/in-app/core/authentication/passkeys.js +5 -5
- package/dist/esm/wallets/in-app/core/authentication/passkeys.js.map +1 -1
- package/dist/esm/wallets/in-app/core/wallet/in-app-core.js +56 -4
- package/dist/esm/wallets/in-app/core/wallet/in-app-core.js.map +1 -1
- package/dist/esm/wallets/in-app/core/wallet/index.js +2 -50
- package/dist/esm/wallets/in-app/core/wallet/index.js.map +1 -1
- package/dist/types/exports/wallets.d.ts +1 -1
- package/dist/types/exports/wallets.d.ts.map +1 -1
- package/dist/types/react/core/utils/isSmartWallet.d.ts.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/dist/types/wallets/ecosystem/get-ecosystem-wallet-auth-options.d.ts +5 -1
- package/dist/types/wallets/ecosystem/get-ecosystem-wallet-auth-options.d.ts.map +1 -1
- package/dist/types/wallets/ecosystem/get-ecosystem-wallet-info.d.ts.map +1 -1
- package/dist/types/wallets/in-app/core/authentication/passkeys.d.ts.map +1 -1
- package/dist/types/wallets/in-app/core/wallet/in-app-core.d.ts.map +1 -1
- package/dist/types/wallets/in-app/core/wallet/index.d.ts +2 -3
- package/dist/types/wallets/in-app/core/wallet/index.d.ts.map +1 -1
- package/dist/types/wallets/in-app/core/wallet/types.d.ts +2 -0
- package/dist/types/wallets/in-app/core/wallet/types.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/exports/wallets.ts +1 -0
- package/src/react/core/utils/isSmartWallet.ts +4 -2
- package/src/react/web/wallets/shared/ConnectWalletSocialOptions.tsx +2 -2
- package/src/version.ts +1 -1
- package/src/wallets/ecosystem/get-ecosystem-wallet-auth-options.ts +36 -23
- package/src/wallets/ecosystem/get-ecosystem-wallet-info.ts +5 -21
- package/src/wallets/in-app/core/authentication/passkeys.ts +5 -7
- package/src/wallets/in-app/core/wallet/in-app-core.ts +62 -4
- package/src/wallets/in-app/core/wallet/index.ts +0 -59
- package/src/wallets/in-app/core/wallet/types.ts +3 -0
@@ -1,26 +1,32 @@
|
|
1
1
|
import { getThirdwebBaseUrl } from "../../utils/domains.js";
|
2
|
+
import { withCache } from "../../utils/promise/withCache.js";
|
2
3
|
/**
|
3
4
|
* Retrieves the specified auth options for a given ecosystem wallet, if any.
|
4
5
|
* @param walletId The ecosystem wallet ID.
|
5
6
|
* @returns {AuthOption[] | undefined} The auth options for the ecosystem wallet.
|
6
7
|
* @internal
|
7
8
|
*/
|
8
|
-
export async function
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
9
|
+
export async function getEcosystemInfo(walletId) {
|
10
|
+
return withCache(async () => {
|
11
|
+
const res = await fetch(`${getThirdwebBaseUrl("inAppWallet")}/api/2024-05-05/ecosystem-wallet`, {
|
12
|
+
headers: {
|
13
|
+
"x-ecosystem-id": walletId,
|
14
|
+
},
|
15
|
+
});
|
16
|
+
const data = await res.json();
|
17
|
+
if (!data || data.code === "UNAUTHORIZED") {
|
18
|
+
throw new Error(data.message ||
|
19
|
+
`Could not find ecosystem wallet with id ${walletId}, please check your ecosystem wallet configuration.`);
|
20
|
+
}
|
21
|
+
// siwe is the auth option in the backend, but we want to use wallet as the auth option in the frontend
|
22
|
+
if (data.authOptions?.includes("siwe")) {
|
23
|
+
data.authOptions = data.authOptions.filter((o) => o !== "siwe");
|
24
|
+
data.authOptions.push("wallet");
|
25
|
+
}
|
26
|
+
return data;
|
27
|
+
}, {
|
28
|
+
cacheKey: `ecosystem-wallet-options-${walletId}`,
|
29
|
+
cacheTime: 1000 * 60 * 5, // 5 mins
|
13
30
|
});
|
14
|
-
const data = await res.json();
|
15
|
-
if (!data || data.code === "UNAUTHORIZED") {
|
16
|
-
throw new Error(data.message ||
|
17
|
-
`Could not find ecosystem wallet with id ${walletId}, please check your ecosystem wallet configuration.`);
|
18
|
-
}
|
19
|
-
// siwe is the auth option in the backend, but we want to use wallet as the auth option in the frontend
|
20
|
-
if (data.authOptions?.includes("siwe")) {
|
21
|
-
data.authOptions = data.authOptions.filter((o) => o !== "siwe");
|
22
|
-
data.authOptions.push("wallet");
|
23
|
-
}
|
24
|
-
return data ?? null;
|
25
31
|
}
|
26
32
|
//# sourceMappingURL=get-ecosystem-wallet-auth-options.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"get-ecosystem-wallet-auth-options.js","sourceRoot":"","sources":["../../../../src/wallets/ecosystem/get-ecosystem-wallet-auth-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;
|
1
|
+
{"version":3,"file":"get-ecosystem-wallet-auth-options.js","sourceRoot":"","sources":["../../../../src/wallets/ecosystem/get-ecosystem-wallet-auth-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAmB7D;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,QAA2B;IAE3B,OAAO,SAAS,CACd,KAAK,IAAI,EAAE;QACT,MAAM,GAAG,GAAG,MAAM,KAAK,CACrB,GAAG,kBAAkB,CAAC,aAAa,CAAC,kCAAkC,EACtE;YACE,OAAO,EAAE;gBACP,gBAAgB,EAAE,QAAQ;aAC3B;SACF,CACF,CAAC;QAEF,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAE9B,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CACb,IAAI,CAAC,OAAO;gBACV,2CAA2C,QAAQ,qDAAqD,CAC3G,CAAC;QACJ,CAAC;QAED,uGAAuG;QACvG,IAAI,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC;YACxE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,EACD;QACE,QAAQ,EAAE,4BAA4B,QAAQ,EAAE;QAChD,SAAS,EAAE,IAAI,GAAG,EAAE,GAAG,CAAC,EAAE,SAAS;KACpC,CACF,CAAC;AACJ,CAAC"}
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import {
|
1
|
+
import { getEcosystemInfo } from "./get-ecosystem-wallet-auth-options.js";
|
2
2
|
/**
|
3
3
|
* Fetches metadata for a given ecosystem wallet.
|
4
4
|
*
|
@@ -8,21 +8,12 @@ import { getThirdwebBaseUrl } from "../../utils/domains.js";
|
|
8
8
|
* @internal
|
9
9
|
*/
|
10
10
|
export async function getEcosystemWalletInfo(walletId) {
|
11
|
-
const
|
12
|
-
headers: {
|
13
|
-
"x-ecosystem-id": walletId,
|
14
|
-
},
|
15
|
-
});
|
16
|
-
const data = await res.json();
|
17
|
-
if (!data || data.code === "UNAUTHORIZED") {
|
18
|
-
throw new Error(data.message ||
|
19
|
-
`Could not find ecosystem wallet with id ${walletId}, please check your ecosystem wallet configuration.`);
|
20
|
-
}
|
11
|
+
const data = await getEcosystemInfo(walletId);
|
21
12
|
return {
|
22
13
|
id: walletId,
|
23
14
|
name: data.name,
|
24
|
-
image_id: data.imageUrl,
|
25
|
-
homepage: data.homepage,
|
15
|
+
image_id: data.imageUrl || "",
|
16
|
+
homepage: data.homepage || "",
|
26
17
|
rdns: null,
|
27
18
|
app: {
|
28
19
|
browser: null,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"get-ecosystem-wallet-info.js","sourceRoot":"","sources":["../../../../src/wallets/ecosystem/get-ecosystem-wallet-info.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"get-ecosystem-wallet-info.js","sourceRoot":"","sources":["../../../../src/wallets/ecosystem/get-ecosystem-wallet-info.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAE1E;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,QAA2B;IAE3B,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAE9C,OAAO;QACL,EAAE,EAAE,QAAQ;QACZ,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,EAAE;QAC7B,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,EAAE;QAC7B,IAAI,EAAE,IAAI;QACV,GAAG,EAAE;YACH,OAAO,EAAE,IAAI;YACb,GAAG,EAAE,IAAI;YACT,OAAO,EAAE,IAAI;YACb,GAAG,EAAE,IAAI;YACT,OAAO,EAAE,IAAI;YACb,KAAK,EAAE,IAAI;YACX,KAAK,EAAE,IAAI;YACX,MAAM,EAAE,IAAI;YACZ,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,IAAI;SACX;QACD,MAAM,EAAE;YACN,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,IAAI;SAChB;QACD,OAAO,EAAE;YACP,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,IAAI;SAChB;KACF,CAAC;AACJ,CAAC"}
|
@@ -69,17 +69,17 @@ export async function loginWithPasskey(options) {
|
|
69
69
|
}
|
70
70
|
const fetchWithId = getClientFetch(options.client, options.ecosystem);
|
71
71
|
// 1. request challenge from server/iframe
|
72
|
-
const
|
73
|
-
|
72
|
+
const [challengeData, credentialId] = await Promise.all([
|
73
|
+
fetchWithId(getChallengePath("sign-in")).then((r) => r.json()),
|
74
|
+
options.storage?.getPasskeyCredentialId(),
|
75
|
+
]);
|
74
76
|
if (!challengeData.challenge) {
|
75
77
|
throw new Error("No challenge received");
|
76
78
|
}
|
77
79
|
const challenge = challengeData.challenge;
|
78
|
-
// 1.2. find the user's credentialId in local storage
|
79
|
-
const credentialId = (await options.storage?.getPasskeyCredentialId()) ?? undefined;
|
80
80
|
// 2. initiate login
|
81
81
|
const authentication = await options.passkeyClient.authenticate({
|
82
|
-
credentialId,
|
82
|
+
credentialId: credentialId ?? undefined,
|
83
83
|
challenge,
|
84
84
|
rp: options.rp,
|
85
85
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"passkeys.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/authentication/passkeys.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"passkeys.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/authentication/passkeys.ts"],"names":[],"mappings":"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"}
|
@@ -1,5 +1,6 @@
|
|
1
1
|
import { trackConnect } from "../../../../analytics/track/connect.js";
|
2
2
|
import { getCachedChainIfExists } from "../../../../chains/utils.js";
|
3
|
+
import { getEcosystemInfo } from "../../../ecosystem/get-ecosystem-wallet-auth-options.js";
|
3
4
|
import { createWalletEmitter } from "../../../wallet-emitter.js";
|
4
5
|
const connectorCache = new Map();
|
5
6
|
/**
|
@@ -18,9 +19,10 @@ export async function getOrCreateInAppWalletConnector(client, connectorFactory,
|
|
18
19
|
* @internal
|
19
20
|
*/
|
20
21
|
export function createInAppWallet(args) {
|
21
|
-
const { createOptions, connectorFactory, ecosystem } = args;
|
22
|
+
const { createOptions: _createOptions, connectorFactory, ecosystem } = args;
|
22
23
|
const walletId = ecosystem ? ecosystem.id : "inApp";
|
23
24
|
const emitter = createWalletEmitter();
|
25
|
+
let createOptions = _createOptions;
|
24
26
|
let account = undefined;
|
25
27
|
let chain = undefined;
|
26
28
|
let client;
|
@@ -39,7 +41,25 @@ export function createInAppWallet(args) {
|
|
39
41
|
autoConnect: async (options) => {
|
40
42
|
const { autoConnectInAppWallet } = await import("./index.js");
|
41
43
|
const connector = await getOrCreateInAppWalletConnector(options.client, connectorFactory, ecosystem);
|
42
|
-
|
44
|
+
if (ecosystem) {
|
45
|
+
const ecosystemOptions = await getEcosystemInfo(ecosystem.id);
|
46
|
+
const smartAccountOptions = ecosystemOptions?.smartAccountOptions;
|
47
|
+
if (smartAccountOptions) {
|
48
|
+
const preferredChain = options.chain;
|
49
|
+
if (!preferredChain) {
|
50
|
+
throw new Error("Chain is required for ecosystem smart accounts, pass it via connect() or via UI components");
|
51
|
+
}
|
52
|
+
createOptions = {
|
53
|
+
...createOptions,
|
54
|
+
smartAccount: {
|
55
|
+
chain: preferredChain,
|
56
|
+
sponsorGas: smartAccountOptions.sponsorGas,
|
57
|
+
factoryAddress: smartAccountOptions.accountFactoryAddress,
|
58
|
+
},
|
59
|
+
};
|
60
|
+
}
|
61
|
+
}
|
62
|
+
const [connectedAccount, connectedChain] = await autoConnectInAppWallet(options, createOptions, connector);
|
43
63
|
// set the states
|
44
64
|
client = options.client;
|
45
65
|
account = connectedAccount;
|
@@ -56,7 +76,25 @@ export function createInAppWallet(args) {
|
|
56
76
|
connect: async (options) => {
|
57
77
|
const { connectInAppWallet } = await import("./index.js");
|
58
78
|
const connector = await getOrCreateInAppWalletConnector(options.client, connectorFactory, ecosystem);
|
59
|
-
|
79
|
+
if (ecosystem) {
|
80
|
+
const ecosystemOptions = await getEcosystemInfo(ecosystem.id);
|
81
|
+
const smartAccountOptions = ecosystemOptions?.smartAccountOptions;
|
82
|
+
if (smartAccountOptions) {
|
83
|
+
const preferredChain = options.chain;
|
84
|
+
if (!preferredChain) {
|
85
|
+
throw new Error("Chain is required for ecosystem smart accounts, pass it via connect() or via UI components");
|
86
|
+
}
|
87
|
+
createOptions = {
|
88
|
+
...createOptions,
|
89
|
+
smartAccount: {
|
90
|
+
chain: preferredChain,
|
91
|
+
sponsorGas: smartAccountOptions.sponsorGas,
|
92
|
+
factoryAddress: smartAccountOptions.accountFactoryAddress,
|
93
|
+
},
|
94
|
+
};
|
95
|
+
}
|
96
|
+
}
|
97
|
+
const [connectedAccount, connectedChain] = await connectInAppWallet(options, createOptions, connector);
|
60
98
|
// set the states
|
61
99
|
client = options.client;
|
62
100
|
account = connectedAccount;
|
@@ -88,10 +126,24 @@ export function createInAppWallet(args) {
|
|
88
126
|
// if account abstraction is enabled, reconnect to smart account on the new chain
|
89
127
|
const { autoConnectInAppWallet } = await import("./index.js");
|
90
128
|
const connector = await getOrCreateInAppWalletConnector(client, connectorFactory, ecosystem);
|
129
|
+
if (ecosystem) {
|
130
|
+
const ecosystemOptions = await getEcosystemInfo(ecosystem.id);
|
131
|
+
const smartAccountOptions = ecosystemOptions?.smartAccountOptions;
|
132
|
+
if (smartAccountOptions) {
|
133
|
+
createOptions = {
|
134
|
+
...createOptions,
|
135
|
+
smartAccount: {
|
136
|
+
chain: newChain,
|
137
|
+
sponsorGas: smartAccountOptions.sponsorGas,
|
138
|
+
factoryAddress: smartAccountOptions.accountFactoryAddress,
|
139
|
+
},
|
140
|
+
};
|
141
|
+
}
|
142
|
+
}
|
91
143
|
const [connectedAccount, connectedChain] = await autoConnectInAppWallet({
|
92
144
|
chain: newChain,
|
93
145
|
client,
|
94
|
-
}, createOptions, connector
|
146
|
+
}, createOptions, connector);
|
95
147
|
account = connectedAccount;
|
96
148
|
chain = connectedChain;
|
97
149
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"in-app-core.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/wallet/in-app-core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AAEtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;
|
1
|
+
{"version":3,"file":"in-app-core.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/wallet/in-app-core.ts"],"names":[],"mappings":"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"}
|
@@ -1,7 +1,5 @@
|
|
1
1
|
import { ethereum } from "../../../../chains/chain-definitions/ethereum.js";
|
2
|
-
import { getCachedChain } from "../../../../chains/utils.js";
|
3
2
|
import { socialAuthOptions, } from "../../../../wallets/types.js";
|
4
|
-
import { getEcosystemOptions } from "../../../ecosystem/get-ecosystem-wallet-auth-options.js";
|
5
3
|
/**
|
6
4
|
* Checks if the provided wallet is an in-app wallet.
|
7
5
|
*
|
@@ -14,7 +12,7 @@ export function isInAppWallet(wallet) {
|
|
14
12
|
/**
|
15
13
|
* @internal
|
16
14
|
*/
|
17
|
-
export async function connectInAppWallet(options, createOptions, connector
|
15
|
+
export async function connectInAppWallet(options, createOptions, connector) {
|
18
16
|
if (
|
19
17
|
// if auth mode is not specified, the default is popup
|
20
18
|
createOptions?.auth?.mode !== "popup" &&
|
@@ -40,35 +38,12 @@ export async function connectInAppWallet(options, createOptions, connector, ecos
|
|
40
38
|
chain: options.chain,
|
41
39
|
});
|
42
40
|
}
|
43
|
-
if (ecosystem) {
|
44
|
-
const ecosystemOptions = await getEcosystemOptions(ecosystem.id);
|
45
|
-
const smartAccountOptions = ecosystemOptions?.smartAccountOptions;
|
46
|
-
if (smartAccountOptions) {
|
47
|
-
const allowedChains = smartAccountOptions.chainIds;
|
48
|
-
const firstAllowedChain = allowedChains[0];
|
49
|
-
if (!firstAllowedChain) {
|
50
|
-
throw new Error("At least one chain must be allowed for ecosystem smart account");
|
51
|
-
}
|
52
|
-
const preferredChain = options.chain && allowedChains.includes(options.chain.id)
|
53
|
-
? options.chain
|
54
|
-
: getCachedChain(firstAllowedChain);
|
55
|
-
return convertToSmartAccount({
|
56
|
-
client: options.client,
|
57
|
-
authAccount,
|
58
|
-
smartAccountOptions: {
|
59
|
-
chain: preferredChain,
|
60
|
-
sponsorGas: smartAccountOptions.sponsorGas,
|
61
|
-
factoryAddress: smartAccountOptions.accountFactoryAddress,
|
62
|
-
},
|
63
|
-
});
|
64
|
-
}
|
65
|
-
}
|
66
41
|
return [authAccount, options.chain || ethereum];
|
67
42
|
}
|
68
43
|
/**
|
69
44
|
* @internal
|
70
45
|
*/
|
71
|
-
export async function autoConnectInAppWallet(options, createOptions, connector
|
46
|
+
export async function autoConnectInAppWallet(options, createOptions, connector) {
|
72
47
|
if (options.authResult && connector.loginWithAuthToken) {
|
73
48
|
await connector.loginWithAuthToken(options.authResult);
|
74
49
|
}
|
@@ -87,29 +62,6 @@ export async function autoConnectInAppWallet(options, createOptions, connector,
|
|
87
62
|
chain: options.chain,
|
88
63
|
});
|
89
64
|
}
|
90
|
-
if (ecosystem) {
|
91
|
-
const ecosystemOptions = await getEcosystemOptions(ecosystem.id);
|
92
|
-
const smartAccountOptions = ecosystemOptions?.smartAccountOptions;
|
93
|
-
if (smartAccountOptions) {
|
94
|
-
const allowedChains = smartAccountOptions.chainIds;
|
95
|
-
const firstAllowedChain = allowedChains[0];
|
96
|
-
if (!firstAllowedChain) {
|
97
|
-
throw new Error("At least one chain must be allowed for ecosystem smart account");
|
98
|
-
}
|
99
|
-
const preferredChain = options.chain && allowedChains.includes(options.chain.id)
|
100
|
-
? options.chain
|
101
|
-
: getCachedChain(firstAllowedChain);
|
102
|
-
return convertToSmartAccount({
|
103
|
-
client: options.client,
|
104
|
-
authAccount,
|
105
|
-
smartAccountOptions: {
|
106
|
-
chain: preferredChain,
|
107
|
-
sponsorGas: smartAccountOptions.sponsorGas,
|
108
|
-
factoryAddress: smartAccountOptions.accountFactoryAddress,
|
109
|
-
},
|
110
|
-
});
|
111
|
-
}
|
112
|
-
}
|
113
65
|
return [authAccount, options.chain || ethereum];
|
114
66
|
}
|
115
67
|
async function convertToSmartAccount(options) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/wallet/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kDAAkD,CAAC;
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/wallet/index.ts"],"names":[],"mappings":"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"}
|
@@ -26,7 +26,7 @@ export type { WalletId, WalletAutoConnectionOption, WalletCreationOptions, Walle
|
|
26
26
|
export type { WCSupportedWalletIds, InjectedSupportedWalletIds, } from "../wallets/__generated__/wallet-ids.js";
|
27
27
|
export type { WCConnectOptions, WCAutoConnectOptions, } from "../wallets/wallet-connect/types.js";
|
28
28
|
export type { SmartWalletConnectionOptions, SmartWalletOptions, } from "../wallets/smart/types.js";
|
29
|
-
export type { InAppWalletAuth,
|
29
|
+
export type { WalletUser, InAppWalletAuth,
|
30
30
|
/**
|
31
31
|
* @deprecated use InAppWalletAuth instead
|
32
32
|
*/
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"wallets.d.ts","sourceRoot":"","sources":["../../../src/exports/wallets.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EACZ,aAAa,GACd,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,WAAW;AACX;;GAEG;AACH,WAAW,IAAI,cAAc,GAC9B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,YAAY,EACV,8BAA8B,EAC9B,gCAAgC,EAChC,iCAAiC,GAClC,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAE/D,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AACvE,YAAY,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAGpE,OAAO,EACL,gBAAgB,EAChB,KAAK,uBAAuB,GAC7B,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,eAAe,EACf,KAAK,sBAAsB,GAC5B,MAAM,qCAAqC,CAAC;AAG7C,OAAO,EACL,mBAAmB;AACnB;;;GAGG;AACH,mBAAmB,IAAI,iBAAiB,EACxC,KAAK,0BAA0B;AAC/B;;;GAGG;AACH,KAAK,0BAA0B,IAAI,wBAAwB,GAC5D,MAAM,2BAA2B,CAAC;AAEnC,YAAY,EACV,QAAQ,EACR,0BAA0B,EAC1B,qBAAqB,EACrB,sBAAsB,EACtB,gBAAgB,EAChB,sBAAsB,EACtB,sCAAsC,EACtC,0BAA0B,GAC3B,MAAM,4BAA4B,CAAC;AAEpC,YAAY,EACV,oBAAoB,EACpB,0BAA0B,GAC3B,MAAM,wCAAwC,CAAC;AAEhD,YAAY,EACV,gBAAgB,EAChB,oBAAoB,GACrB,MAAM,oCAAoC,CAAC;AAE5C,YAAY,EACV,4BAA4B,EAC5B,kBAAkB,GACnB,MAAM,2BAA2B,CAAC;AAEnC,YAAY,EACV,eAAe;AACf;;GAEG;AACH,eAAe,IAAI,kBAAkB,EACrC,6BAA6B;AAC7B;;GAEG;AACH,6BAA6B,IAAI,gCAAgC,EACjE,4BAA4B;AAC5B;;GAEG;AACH,4BAA4B,IAAI,+BAA+B,EAC/D,qBAAqB;AACrB;;GAEG;AACH,qBAAqB,IAAI,wBAAwB,GAClD,MAAM,wCAAwC,CAAC;AAEhD,OAAO,EACL,eAAe,EACf,YAAY,EACZ,wBAAwB,EACxB,YAAY,EACZ,kBAAkB,EAClB,WAAW,EACX,WAAW,GACZ,MAAM,yCAAyC,CAAC;AACjD,YAAY,EAAE,OAAO,EAAE,MAAM,gDAAgD,CAAC;AAE9E,OAAO,EACL,OAAO,EACP,KAAK,aAAa,GACnB,MAAM,yCAAyC,CAAC;AAEjD,YAAY,EACV,6BAA6B,EAC7B,kCAAkC,GACnC,MAAM,uCAAuC,CAAC;AAE/C,YAAY,EACV,aAAa,EACb,mBAAmB,GACpB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC1E,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,YAAY,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAG1E,OAAO,EACL,yBAAyB,EACzB,0BAA0B,EAC1B,8BAA8B,EAC9B,8BAA8B,EAC9B,mCAAmC,GACpC,MAAM,6CAA6C,CAAC;AACrD,YAAY,EACV,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,6CAA6C,CAAC;AAKrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE,YAAY,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC"}
|
1
|
+
{"version":3,"file":"wallets.d.ts","sourceRoot":"","sources":["../../../src/exports/wallets.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EACZ,aAAa,GACd,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,WAAW;AACX;;GAEG;AACH,WAAW,IAAI,cAAc,GAC9B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,YAAY,EACV,8BAA8B,EAC9B,gCAAgC,EAChC,iCAAiC,GAClC,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAE/D,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AACvE,YAAY,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAGpE,OAAO,EACL,gBAAgB,EAChB,KAAK,uBAAuB,GAC7B,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,eAAe,EACf,KAAK,sBAAsB,GAC5B,MAAM,qCAAqC,CAAC;AAG7C,OAAO,EACL,mBAAmB;AACnB;;;GAGG;AACH,mBAAmB,IAAI,iBAAiB,EACxC,KAAK,0BAA0B;AAC/B;;;GAGG;AACH,KAAK,0BAA0B,IAAI,wBAAwB,GAC5D,MAAM,2BAA2B,CAAC;AAEnC,YAAY,EACV,QAAQ,EACR,0BAA0B,EAC1B,qBAAqB,EACrB,sBAAsB,EACtB,gBAAgB,EAChB,sBAAsB,EACtB,sCAAsC,EACtC,0BAA0B,GAC3B,MAAM,4BAA4B,CAAC;AAEpC,YAAY,EACV,oBAAoB,EACpB,0BAA0B,GAC3B,MAAM,wCAAwC,CAAC;AAEhD,YAAY,EACV,gBAAgB,EAChB,oBAAoB,GACrB,MAAM,oCAAoC,CAAC;AAE5C,YAAY,EACV,4BAA4B,EAC5B,kBAAkB,GACnB,MAAM,2BAA2B,CAAC;AAEnC,YAAY,EACV,UAAU,EACV,eAAe;AACf;;GAEG;AACH,eAAe,IAAI,kBAAkB,EACrC,6BAA6B;AAC7B;;GAEG;AACH,6BAA6B,IAAI,gCAAgC,EACjE,4BAA4B;AAC5B;;GAEG;AACH,4BAA4B,IAAI,+BAA+B,EAC/D,qBAAqB;AACrB;;GAEG;AACH,qBAAqB,IAAI,wBAAwB,GAClD,MAAM,wCAAwC,CAAC;AAEhD,OAAO,EACL,eAAe,EACf,YAAY,EACZ,wBAAwB,EACxB,YAAY,EACZ,kBAAkB,EAClB,WAAW,EACX,WAAW,GACZ,MAAM,yCAAyC,CAAC;AACjD,YAAY,EAAE,OAAO,EAAE,MAAM,gDAAgD,CAAC;AAE9E,OAAO,EACL,OAAO,EACP,KAAK,aAAa,GACnB,MAAM,yCAAyC,CAAC;AAEjD,YAAY,EACV,6BAA6B,EAC7B,kCAAkC,GACnC,MAAM,uCAAuC,CAAC;AAE/C,YAAY,EACV,aAAa,EACb,mBAAmB,GACpB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC1E,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,YAAY,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAG1E,OAAO,EACL,yBAAyB,EACzB,0BAA0B,EAC1B,8BAA8B,EAC9B,8BAA8B,EAC9B,mCAAmC,GACpC,MAAM,6CAA6C,CAAC;AACrD,YAAY,EACV,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,6CAA6C,CAAC;AAKrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE,YAAY,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"isSmartWallet.d.ts","sourceRoot":"","sources":["../../../../../src/react/core/utils/isSmartWallet.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"isSmartWallet.d.ts","sourceRoot":"","sources":["../../../../../src/react/core/utils/isSmartWallet.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAEpE,wBAAgB,eAAe,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAQ9D"}
|
package/dist/types/version.d.ts
CHANGED
@@ -1,2 +1,2 @@
|
|
1
|
-
export declare const version = "5.64.
|
1
|
+
export declare const version = "5.64.4-nightly-043ee925981bdc39649d30ad65d2fce922515ab0-20241030000335";
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
@@ -1,6 +1,10 @@
|
|
1
1
|
import type { AuthOption } from "../types.js";
|
2
2
|
import type { EcosystemWalletId } from "../wallet-types.js";
|
3
3
|
export type EcosystemOptions = {
|
4
|
+
name: string;
|
5
|
+
imageUrl?: string;
|
6
|
+
slug: string;
|
7
|
+
homepage?: string;
|
4
8
|
authOptions: AuthOption[];
|
5
9
|
smartAccountOptions: SmartAccountOptions;
|
6
10
|
};
|
@@ -15,6 +19,6 @@ type SmartAccountOptions = {
|
|
15
19
|
* @returns {AuthOption[] | undefined} The auth options for the ecosystem wallet.
|
16
20
|
* @internal
|
17
21
|
*/
|
18
|
-
export declare function
|
22
|
+
export declare function getEcosystemInfo(walletId: EcosystemWalletId): Promise<EcosystemOptions>;
|
19
23
|
export {};
|
20
24
|
//# sourceMappingURL=get-ecosystem-wallet-auth-options.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"get-ecosystem-wallet-auth-options.d.ts","sourceRoot":"","sources":["../../../../src/wallets/ecosystem/get-ecosystem-wallet-auth-options.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"get-ecosystem-wallet-auth-options.d.ts","sourceRoot":"","sources":["../../../../src/wallets/ecosystem/get-ecosystem-wallet-auth-options.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAE5D,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,qBAAqB,EAAE,MAAM,CAAC;CAC/B,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,iBAAiB,GAC1B,OAAO,CAAC,gBAAgB,CAAC,CAkC3B"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"get-ecosystem-wallet-info.d.ts","sourceRoot":"","sources":["../../../../src/wallets/ecosystem/get-ecosystem-wallet-info.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"get-ecosystem-wallet-info.d.ts","sourceRoot":"","sources":["../../../../src/wallets/ecosystem/get-ecosystem-wallet-info.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAG5D;;;;;;;GAOG;AACH,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,iBAAiB,GAC1B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CA+B/B"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"passkeys.d.ts","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/authentication/passkeys.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAGnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,YAAY,CAAC;AAetE,MAAM,MAAM,cAAc,GAAG;IAC3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE;QACV,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC;AAElD,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,CAAC,IAAI,EAAE;QACf,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,EAAE,EAAE,MAAM,CAAC;KACZ,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IAC9B,YAAY,EAAE,CAAC,IAAI,EAAE;QACnB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;QACjC,SAAS,EAAE,MAAM,CAAC;QAClB,EAAE,EAAE,MAAM,CAAC;KACZ,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAClC,WAAW,EAAE,MAAM,OAAO,CAAC;CAC5B;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE;IAC7C,MAAM,EAAE,cAAc,CAAC;IACvB,aAAa,EAAE,aAAa,CAAC;IAC7B,OAAO,CAAC,EAAE,mBAAmB,CAAC;IAC9B,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,EAAE,EAAE,MAAM,CAAC;CACZ,GAAG,OAAO,CAAC,mCAAmC,CAAC,CA+D/C;AAED,wBAAsB,gBAAgB,CAAC,OAAO,EAAE;IAC9C,MAAM,EAAE,cAAc,CAAC;IACvB,aAAa,EAAE,aAAa,CAAC;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,CAAC,EAAE,mBAAmB,CAAC;IAC9B,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB,GAAG,OAAO,CAAC,mCAAmC,CAAC,
|
1
|
+
{"version":3,"file":"passkeys.d.ts","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/authentication/passkeys.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAGnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,YAAY,CAAC;AAetE,MAAM,MAAM,cAAc,GAAG;IAC3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE;QACV,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC;AAElD,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,CAAC,IAAI,EAAE;QACf,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,EAAE,EAAE,MAAM,CAAC;KACZ,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IAC9B,YAAY,EAAE,CAAC,IAAI,EAAE;QACnB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;QACjC,SAAS,EAAE,MAAM,CAAC;QAClB,EAAE,EAAE,MAAM,CAAC;KACZ,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAClC,WAAW,EAAE,MAAM,OAAO,CAAC;CAC5B;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE;IAC7C,MAAM,EAAE,cAAc,CAAC;IACvB,aAAa,EAAE,aAAa,CAAC;IAC7B,OAAO,CAAC,EAAE,mBAAmB,CAAC;IAC9B,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,EAAE,EAAE,MAAM,CAAC;CACZ,GAAG,OAAO,CAAC,mCAAmC,CAAC,CA+D/C;AAED,wBAAsB,gBAAgB,CAAC,OAAO,EAAE;IAC9C,MAAM,EAAE,cAAc,CAAC;IACvB,aAAa,EAAE,aAAa,CAAC;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,CAAC,EAAE,mBAAmB,CAAC;IAC9B,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB,GAAG,OAAO,CAAC,mCAAmC,CAAC,CA4D/C"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"in-app-core.d.ts","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/wallet/in-app-core.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;
|
1
|
+
{"version":3,"file":"in-app-core.d.ts","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/wallet/in-app-core.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAEnE,OAAO,KAAK,EAAW,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAErE,OAAO,KAAK,EACV,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAI5C;;GAEG;AACH,wBAAsB,+BAA+B,CACnD,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,OAAO,CAAC,cAAc,CAAC,EACrE,SAAS,CAAC,EAAE,SAAS,2BAStB;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IACtC,aAAa,CAAC,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7C,gBAAgB,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IACtE,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB,GAAG,MAAM,CAAC,OAAO,GAAG,iBAAiB,CAAC,CAiLtC"}
|
@@ -3,7 +3,6 @@ import type { Account, Wallet } from "../../../interfaces/wallet.js";
|
|
3
3
|
import type { EcosystemWalletId, WalletId } from "../../../wallet-types.js";
|
4
4
|
import type { CreateWalletArgs, WalletAutoConnectionOption, WalletConnectionOption } from "../../../wallet-types.js";
|
5
5
|
import type { InAppConnector } from "../interfaces/connector.js";
|
6
|
-
import type { Ecosystem } from "./types.js";
|
7
6
|
/**
|
8
7
|
* Checks if the provided wallet is an in-app wallet.
|
9
8
|
*
|
@@ -14,9 +13,9 @@ export declare function isInAppWallet(wallet: Wallet<WalletId>): wallet is Walle
|
|
14
13
|
/**
|
15
14
|
* @internal
|
16
15
|
*/
|
17
|
-
export declare function connectInAppWallet(options: WalletConnectionOption<"inApp"> | WalletConnectionOption<EcosystemWalletId>, createOptions: CreateWalletArgs<"inApp">[1] | CreateWalletArgs<EcosystemWalletId>[1], connector: InAppConnector
|
16
|
+
export declare function connectInAppWallet(options: WalletConnectionOption<"inApp"> | WalletConnectionOption<EcosystemWalletId>, createOptions: CreateWalletArgs<"inApp">[1] | CreateWalletArgs<EcosystemWalletId>[1], connector: InAppConnector): Promise<[Account, Chain]>;
|
18
17
|
/**
|
19
18
|
* @internal
|
20
19
|
*/
|
21
|
-
export declare function autoConnectInAppWallet(options: WalletAutoConnectionOption<"inApp"> | WalletAutoConnectionOption<EcosystemWalletId>, createOptions: CreateWalletArgs<"inApp">[1] | CreateWalletArgs<EcosystemWalletId>[1], connector: InAppConnector
|
20
|
+
export declare function autoConnectInAppWallet(options: WalletAutoConnectionOption<"inApp"> | WalletAutoConnectionOption<EcosystemWalletId>, createOptions: CreateWalletArgs<"inApp">[1] | CreateWalletArgs<EcosystemWalletId>[1], connector: InAppConnector): Promise<[Account, Chain]>;
|
22
21
|
//# sourceMappingURL=index.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/wallet/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/wallet/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAMzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAC5E,OAAO,KAAK,EACV,gBAAgB,EAChB,0BAA0B,EAC1B,sBAAsB,EACvB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE;;;;;GAKG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,GACvB,MAAM,IAAI,MAAM,CAAC,OAAO,GAAG,UAAU,CAAC,CAExC;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EACH,sBAAsB,CAAC,OAAO,CAAC,GAC/B,sBAAsB,CAAC,iBAAiB,CAAC,EAC7C,aAAa,EACT,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAC5B,gBAAgB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAC1C,SAAS,EAAE,cAAc,GACxB,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAqC3B;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EACH,0BAA0B,CAAC,OAAO,CAAC,GACnC,0BAA0B,CAAC,iBAAiB,CAAC,EACjD,aAAa,EACT,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAC5B,gBAAgB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAC1C,SAAS,EAAE,cAAc,GACxB,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CA0B3B"}
|
@@ -4,6 +4,7 @@ import type { SmartWalletOptions } from "../../../smart/types.js";
|
|
4
4
|
import type { AuthOption, OAuthOption, SocialAuthOption } from "../../../types.js";
|
5
5
|
import type { EcosystemWalletId } from "../../../wallet-types.js";
|
6
6
|
import type { AuthStoredTokenWithCookieReturnType, MultiStepAuthArgsType, SingleStepAuthArgsType } from "../authentication/types.js";
|
7
|
+
import type { UserStatus } from "./enclave-wallet.js";
|
7
8
|
export type Ecosystem = {
|
8
9
|
id: EcosystemWalletId;
|
9
10
|
partnerId?: string;
|
@@ -18,6 +19,7 @@ export type InAppWalletAutoConnectOptions = {
|
|
18
19
|
authResult?: AuthStoredTokenWithCookieReturnType;
|
19
20
|
chain?: Chain;
|
20
21
|
};
|
22
|
+
export type WalletUser = UserStatus;
|
21
23
|
export type InAppWalletSocialAuth = SocialAuthOption;
|
22
24
|
export type InAppWalletOAuth = OAuthOption;
|
23
25
|
export type InAppWalletAuth = AuthOption;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/wallet/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,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EACV,UAAU,EACV,WAAW,EACX,gBAAgB,EACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EACV,mCAAmC,EACnC,qBAAqB,EACrB,sBAAsB,EACvB,MAAM,4BAA4B,CAAC;
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/wallet/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,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EACV,UAAU,EACV,WAAW,EACX,gBAAgB,EACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EACV,mCAAmC,EACnC,qBAAqB,EACrB,sBAAsB,EACvB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,MAAM,SAAS,GAAG;IACtB,EAAE,EAAE,iBAAiB,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG,CACvC,qBAAqB,GACrB,sBAAsB,CACzB,GAAG;IACF,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,MAAM,EAAE,cAAc,CAAC;IACvB,UAAU,CAAC,EAAE,mCAAmC,CAAC;IACjD,KAAK,CAAC,EAAE,KAAK,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,UAAU,CAAC;AAEpC,MAAM,MAAM,qBAAqB,GAAG,gBAAgB,CAAC;AACrD,MAAM,MAAM,gBAAgB,GAAG,WAAW,CAAC;AAC3C,MAAM,MAAM,eAAe,GAAG,UAAU,CAAC;AAEzC,MAAM,MAAM,0BAA0B,GAClC;IACE,IAAI,CAAC,EAAE;QACL;;WAEG;QACH,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B;;WAEG;QACH,IAAI,CAAC,EAAE,OAAO,GAAG,UAAU,GAAG,QAAQ,CAAC;QACvC;;WAEG;QACH,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB;;WAEG;QACH,aAAa,CAAC,EAAE,MAAM,CAAC;KACxB,CAAC;IACF;;OAEG;IACH,QAAQ,CAAC,EAAE;QACT,KAAK,CAAC,EAAE;YACN,GAAG,EAAE,MAAM,CAAC;YACZ,KAAK,CAAC,EAAE,MAAM,CAAC;YACf,MAAM,CAAC,EAAE,MAAM,CAAC;YAChB,GAAG,CAAC,EAAE,MAAM,CAAC;SACd,CAAC;KACH,CAAC;IACF;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;QAEI;IACJ,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAClC;;OAEG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,GACD,SAAS,CAAC"}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "thirdweb",
|
3
|
-
"version": "5.64.
|
3
|
+
"version": "5.64.4-nightly-043ee925981bdc39649d30ad65d2fce922515ab0-20241030000335",
|
4
4
|
"repository": {
|
5
5
|
"type": "git",
|
6
6
|
"url": "git+https://github.com/thirdweb-dev/js.git#main"
|
package/src/exports/wallets.ts
CHANGED
@@ -1,10 +1,12 @@
|
|
1
|
+
import { isEcosystemWallet } from "../../../wallets/ecosystem/is-ecosystem-wallet.js";
|
1
2
|
import type { Wallet } from "../../../wallets/interfaces/wallet.js";
|
2
3
|
|
3
4
|
export function hasSmartAccount(activeWallet?: Wallet): boolean {
|
4
5
|
const config = activeWallet?.getConfig();
|
5
6
|
return (
|
6
|
-
|
7
|
+
activeWallet !== undefined &&
|
7
8
|
(activeWallet.id === "smart" ||
|
8
|
-
(activeWallet.id === "inApp" && !!config && "smartAccount" in config)
|
9
|
+
(activeWallet.id === "inApp" && !!config && "smartAccount" in config) ||
|
10
|
+
(isEcosystemWallet(activeWallet) && !!config && "smartAccount" in config))
|
9
11
|
);
|
10
12
|
}
|
@@ -5,7 +5,7 @@ import { useMemo, useState } from "react";
|
|
5
5
|
import type { Chain } from "../../../../chains/types.js";
|
6
6
|
import type { ThirdwebClient } from "../../../../client/client.js";
|
7
7
|
import { webLocalStorage } from "../../../../utils/storage/webStorage.js";
|
8
|
-
import {
|
8
|
+
import { getEcosystemInfo } from "../../../../wallets/ecosystem/get-ecosystem-wallet-auth-options.js";
|
9
9
|
import { isEcosystemWallet } from "../../../../wallets/ecosystem/is-ecosystem-wallet.js";
|
10
10
|
import type { Profile } from "../../../../wallets/in-app/core/authentication/types.js";
|
11
11
|
import { linkProfile } from "../../../../wallets/in-app/web/lib/auth/index.js";
|
@@ -123,7 +123,7 @@ export const ConnectWalletSocialOptions = (
|
|
123
123
|
queryKey: ["auth-options", wallet.id],
|
124
124
|
queryFn: async () => {
|
125
125
|
if (isEcosystemWallet(wallet)) {
|
126
|
-
const options = await
|
126
|
+
const options = await getEcosystemInfo(wallet.id);
|
127
127
|
return options?.authOptions ?? null;
|
128
128
|
}
|
129
129
|
return null;
|
package/src/version.ts
CHANGED
@@ -1 +1 @@
|
|
1
|
-
export const version = "5.64.
|
1
|
+
export const version = "5.64.4-nightly-043ee925981bdc39649d30ad65d2fce922515ab0-20241030000335";
|