thirdweb 5.98.0 → 5.98.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/extensions/erc20/read/getCurrencyMetadata.js +2 -2
- package/dist/cjs/extensions/erc20/read/getCurrencyMetadata.js.map +1 -1
- package/dist/cjs/react/native/ui/connect/ConnectButton.js +4 -1
- package/dist/cjs/react/native/ui/connect/ConnectButton.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/ConnectButton.js +6 -4
- package/dist/cjs/react/web/ui/ConnectWallet/ConnectButton.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/Modal/ConnectEmbed.js +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/Modal/ConnectEmbed.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/fiat/OnRampScreen.js +5 -15
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/fiat/OnRampScreen.js.map +1 -1
- package/dist/cjs/react/web/ui/PayEmbed.js +8 -1
- package/dist/cjs/react/web/ui/PayEmbed.js.map +1 -1
- package/dist/cjs/storage/upload/web-node.js +2 -0
- package/dist/cjs/storage/upload/web-node.js.map +1 -1
- package/dist/cjs/utils/fetch.js +10 -7
- package/dist/cjs/utils/fetch.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/cjs/wallets/connection/autoConnectCore.js +29 -12
- package/dist/cjs/wallets/connection/autoConnectCore.js.map +1 -1
- package/dist/cjs/wallets/engine/index.js +2 -1
- package/dist/cjs/wallets/engine/index.js.map +1 -1
- package/dist/cjs/wallets/in-app/core/wallet/is-in-app-signer.js +15 -0
- package/dist/cjs/wallets/in-app/core/wallet/is-in-app-signer.js.map +1 -0
- package/dist/esm/extensions/erc20/read/getCurrencyMetadata.js +2 -2
- package/dist/esm/extensions/erc20/read/getCurrencyMetadata.js.map +1 -1
- package/dist/esm/react/native/ui/connect/ConnectButton.js +4 -1
- package/dist/esm/react/native/ui/connect/ConnectButton.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/ConnectButton.js +6 -4
- package/dist/esm/react/web/ui/ConnectWallet/ConnectButton.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/Modal/ConnectEmbed.js +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/Modal/ConnectEmbed.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/fiat/OnRampScreen.js +1 -11
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/fiat/OnRampScreen.js.map +1 -1
- package/dist/esm/react/web/ui/PayEmbed.js +8 -1
- package/dist/esm/react/web/ui/PayEmbed.js.map +1 -1
- package/dist/esm/storage/upload/web-node.js +2 -0
- package/dist/esm/storage/upload/web-node.js.map +1 -1
- package/dist/esm/utils/fetch.js +10 -7
- package/dist/esm/utils/fetch.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/esm/wallets/connection/autoConnectCore.js +29 -12
- package/dist/esm/wallets/connection/autoConnectCore.js.map +1 -1
- package/dist/esm/wallets/engine/index.js +2 -1
- package/dist/esm/wallets/engine/index.js.map +1 -1
- package/dist/esm/wallets/in-app/core/wallet/is-in-app-signer.js +12 -0
- package/dist/esm/wallets/in-app/core/wallet/is-in-app-signer.js.map +1 -0
- package/dist/types/react/native/ui/connect/ConnectButton.d.ts.map +1 -1
- package/dist/types/react/web/ui/ConnectWallet/ConnectButton.d.ts.map +1 -1
- package/dist/types/react/web/ui/ConnectWallet/Modal/ConnectEmbed.d.ts.map +1 -1
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/fiat/OnRampScreen.d.ts.map +1 -1
- package/dist/types/react/web/ui/PayEmbed.d.ts +1 -1
- package/dist/types/react/web/ui/PayEmbed.d.ts.map +1 -1
- package/dist/types/storage/upload/web-node.d.ts.map +1 -1
- package/dist/types/utils/fetch.d.ts +1 -0
- package/dist/types/utils/fetch.d.ts.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/dist/types/wallets/connection/autoConnectCore.d.ts.map +1 -1
- package/dist/types/wallets/connection/types.d.ts +9 -0
- package/dist/types/wallets/connection/types.d.ts.map +1 -1
- package/dist/types/wallets/engine/index.d.ts.map +1 -1
- package/dist/types/wallets/in-app/core/wallet/is-in-app-signer.d.ts +6 -0
- package/dist/types/wallets/in-app/core/wallet/is-in-app-signer.d.ts.map +1 -0
- package/package.json +2 -2
- package/src/auth/verify-typed-data.test.ts +4 -3
- package/src/extensions/erc20/read/getCurrencyMetadata.ts +2 -2
- package/src/react/native/ui/connect/ConnectButton.tsx +4 -1
- package/src/react/web/ui/ConnectWallet/ConnectButton.tsx +11 -3
- package/src/react/web/ui/ConnectWallet/Modal/ConnectEmbed.tsx +1 -0
- package/src/react/web/ui/ConnectWallet/screens/Buy/fiat/OnRampScreen.tsx +1 -21
- package/src/react/web/ui/PayEmbed.tsx +15 -1
- package/src/storage/upload/web-node.ts +2 -0
- package/src/utils/fetch.test.ts +23 -1
- package/src/utils/fetch.ts +18 -11
- package/src/version.ts +1 -1
- package/src/wallets/connection/autoConnectCore.ts +33 -12
- package/src/wallets/connection/types.ts +10 -0
- package/src/wallets/engine/index.ts +2 -1
- package/src/wallets/in-app/core/wallet/is-in-app-signer.ts +21 -0
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { timeoutPromise } from "../../utils/timeoutPromise.js";
|
|
2
2
|
import { isEcosystemWallet } from "../ecosystem/is-ecosystem-wallet.js";
|
|
3
3
|
import { ClientScopedStorage } from "../in-app/core/authentication/client-scoped-storage.js";
|
|
4
|
+
import { isInAppSigner } from "../in-app/core/wallet/is-in-app-signer.js";
|
|
4
5
|
import { getUrlToken } from "../in-app/web/lib/get-url-token.js";
|
|
5
6
|
import { getLastConnectedChain, getStoredActiveWalletId, getStoredConnectedWalletIds, } from "../manager/index.js";
|
|
6
7
|
let lastAutoConnectionResultPromise = undefined;
|
|
@@ -31,10 +32,10 @@ const _autoConnectCore = async ({ storage, props, createWalletFn, manager, conne
|
|
|
31
32
|
getStoredConnectedWalletIds(storage),
|
|
32
33
|
getStoredActiveWalletId(storage),
|
|
33
34
|
]);
|
|
34
|
-
const
|
|
35
|
+
const urlToken = getUrlToken();
|
|
35
36
|
// If an auth cookie is found and this site supports the wallet, we'll set the auth cookie in the client storage
|
|
36
|
-
const wallet = wallets.find((w) => w.id ===
|
|
37
|
-
if (
|
|
37
|
+
const wallet = wallets.find((w) => w.id === urlToken?.walletId);
|
|
38
|
+
if (urlToken?.authCookie && wallet) {
|
|
38
39
|
const clientStorage = new ClientScopedStorage({
|
|
39
40
|
storage,
|
|
40
41
|
clientId: props.client.clientId,
|
|
@@ -45,16 +46,16 @@ const _autoConnectCore = async ({ storage, props, createWalletFn, manager, conne
|
|
|
45
46
|
}
|
|
46
47
|
: undefined,
|
|
47
48
|
});
|
|
48
|
-
await clientStorage.saveAuthCookie(
|
|
49
|
+
await clientStorage.saveAuthCookie(urlToken.authCookie);
|
|
49
50
|
}
|
|
50
|
-
if (
|
|
51
|
-
lastActiveWalletId =
|
|
52
|
-
lastConnectedWalletIds = lastConnectedWalletIds?.includes(
|
|
51
|
+
if (urlToken?.walletId) {
|
|
52
|
+
lastActiveWalletId = urlToken.walletId;
|
|
53
|
+
lastConnectedWalletIds = lastConnectedWalletIds?.includes(urlToken.walletId)
|
|
53
54
|
? lastConnectedWalletIds
|
|
54
|
-
: [
|
|
55
|
+
: [urlToken.walletId, ...(lastConnectedWalletIds || [])];
|
|
55
56
|
}
|
|
56
|
-
if (
|
|
57
|
-
await setLastAuthProvider?.(
|
|
57
|
+
if (urlToken?.authProvider) {
|
|
58
|
+
await setLastAuthProvider?.(urlToken.authProvider, storage);
|
|
58
59
|
}
|
|
59
60
|
// if no wallets were last connected or we didn't receive an auth token
|
|
60
61
|
if (!lastConnectedWalletIds) {
|
|
@@ -73,7 +74,7 @@ const _autoConnectCore = async ({ storage, props, createWalletFn, manager, conne
|
|
|
73
74
|
wallet: activeWallet,
|
|
74
75
|
client: props.client,
|
|
75
76
|
lastConnectedChain,
|
|
76
|
-
authResult:
|
|
77
|
+
authResult: urlToken?.authResult,
|
|
77
78
|
}), {
|
|
78
79
|
ms: timeout,
|
|
79
80
|
message: `AutoConnect timeout: ${timeout}ms limit exceeded.`,
|
|
@@ -122,7 +123,7 @@ const _autoConnectCore = async ({ storage, props, createWalletFn, manager, conne
|
|
|
122
123
|
wallet,
|
|
123
124
|
client: props.client,
|
|
124
125
|
lastConnectedChain,
|
|
125
|
-
authResult:
|
|
126
|
+
authResult: urlToken?.authResult,
|
|
126
127
|
});
|
|
127
128
|
manager.addConnectedWallet(wallet);
|
|
128
129
|
}
|
|
@@ -130,6 +131,22 @@ const _autoConnectCore = async ({ storage, props, createWalletFn, manager, conne
|
|
|
130
131
|
// no-op
|
|
131
132
|
}
|
|
132
133
|
}
|
|
134
|
+
// Auto-login with SIWE
|
|
135
|
+
const isIAW = activeWallet &&
|
|
136
|
+
isInAppSigner({
|
|
137
|
+
wallet: activeWallet,
|
|
138
|
+
connectedWallets: activeWallet
|
|
139
|
+
? [activeWallet, ...otherWallets]
|
|
140
|
+
: otherWallets,
|
|
141
|
+
});
|
|
142
|
+
if (isIAW &&
|
|
143
|
+
props.siweAuth?.requiresAuth &&
|
|
144
|
+
!props.siweAuth?.isLoggedIn &&
|
|
145
|
+
!props.siweAuth?.isLoggingIn) {
|
|
146
|
+
await props.siweAuth?.doLogin().catch((err) => {
|
|
147
|
+
console.warn("Error signing in with SIWE:", err.message);
|
|
148
|
+
});
|
|
149
|
+
}
|
|
133
150
|
manager.isAutoConnecting.setValue(false);
|
|
134
151
|
return autoConnected; // useQuery needs a return value
|
|
135
152
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autoConnectCore.js","sourceRoot":"","sources":["../../../../src/wallets/connection/autoConnectCore.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wDAAwD,CAAC;AAK7F,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AAEjE,OAAO,EAEL,qBAAqB,EACrB,uBAAuB,EACvB,2BAA2B,GAC5B,MAAM,qBAAqB,CAAC;AAyB7B,IAAI,+BAA+B,GAAiC,SAAS,CAAC;AAE9E;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,KAA2B,EAAE,EAAE;IACnE,2CAA2C;IAC3C,IAAI,+BAA+B,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACpD,0BAA0B;QAC1B,MAAM,UAAU,GAAG,MAAM,+BAA+B,CAAC;QACzD,oCAAoC;QACpC,4CAA4C;QAC5C,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,MAAM,aAAa,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC9C,+BAA+B,GAAG,aAAa,CAAC;IAChD,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,KAAK,EAAE,EAC9B,OAAO,EACP,KAAK,EACL,cAAc,EACd,OAAO,EACP,eAAe,EACf,mBAAmB,EACnB,mBAAmB,GACE,EAAoB,EAAE;IAC3C,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IACrC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC;IAEvC,IAAI,aAAa,GAAG,KAAK,CAAC;IAC1B,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAExC,IAAI,CAAC,sBAAsB,EAAE,kBAAkB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACnE,2BAA2B,CAAC,OAAO,CAAC;QACpC,uBAAuB,CAAC,OAAO,CAAC;KACjC,CAAC,CAAC;IAEH,MAAM,
|
|
1
|
+
{"version":3,"file":"autoConnectCore.js","sourceRoot":"","sources":["../../../../src/wallets/connection/autoConnectCore.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,11 +58,12 @@ export function engineAccount(options) {
|
|
|
58
58
|
// engine wants a hex string here so we serialize it
|
|
59
59
|
data: transaction.data || "0x",
|
|
60
60
|
// value is always required
|
|
61
|
-
value:
|
|
61
|
+
value: transaction.value ?? 0n,
|
|
62
62
|
// optional authorization list
|
|
63
63
|
authorizationList: transaction.authorizationList,
|
|
64
64
|
txOverrides: {
|
|
65
65
|
gas: transaction.gas,
|
|
66
|
+
value: transaction.value,
|
|
66
67
|
},
|
|
67
68
|
};
|
|
68
69
|
// TODO: gas overrides etc?
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/wallets/engine/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAuChD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAM,UAAU,aAAa,CAAC,OAA6B;IACzD,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAE1E,sCAAsC;IACtC,MAAM,OAAO,GAAgB;QAC3B,0BAA0B,EAAE,aAAa;QACzC,aAAa,EAAE,UAAU,SAAS,EAAE;QACpC,cAAc,EAAE,kBAAkB;KACnC,CAAC;IAEF,IAAI,SAAS,EAAE,cAAc,EAAE,CAAC;QAC9B,OAAO,CAAC,mBAAmB,CAAC,GAAG,SAAS,CAAC,cAAc,CAAC;IAC1D,CAAC;IACD,IAAI,SAAS,EAAE,qBAAqB,EAAE,CAAC;QACrC,OAAO,CAAC,2BAA2B,CAAC,GAAG,SAAS,CAAC,qBAAqB,CAAC;IACzE,CAAC;IACD,IAAI,SAAS,EAAE,WAAW,EAAE,CAAC;QAC3B,OAAO,CAAC,gBAAgB,CAAC,GAAG,SAAS,CAAC,WAAW,CAAC;IACpD,CAAC;IAED,OAAO;QACL,OAAO,EAAE,aAAa;QACtB,eAAe,EAAE,KAAK,EAAE,WAAkC,EAAE,EAAE;YAC5D,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;YACtC,UAAU,CAAC,QAAQ,GAAG,mBAAmB,WAAW,CAAC,OAAO,mBAAmB,CAAC;YAEhF,MAAM,UAAU,GAA4B;gBAC1C,+DAA+D;gBAC/D,SAAS,EAAE,WAAW,CAAC,EAAE,IAAI,SAAS;gBACtC,oDAAoD;gBACpD,IAAI,EAAE,WAAW,CAAC,IAAI,IAAI,IAAI;gBAC9B,2BAA2B;gBAC3B,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/wallets/engine/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { isEcosystemWallet } from "../../../../wallets/ecosystem/is-ecosystem-wallet.js";
|
|
2
|
+
import { isSmartWallet } from "../../../smart/index.js";
|
|
3
|
+
import { isInAppWallet } from "./index.js";
|
|
4
|
+
export function isInAppSigner(options) {
|
|
5
|
+
const isInAppOrEcosystem = (w) => isInAppWallet(w) || isEcosystemWallet(w);
|
|
6
|
+
const isSmartWalletWithAdmin = isSmartWallet(options.wallet) &&
|
|
7
|
+
options.connectedWallets.some((w) => isInAppOrEcosystem(w) &&
|
|
8
|
+
w.getAccount()?.address?.toLowerCase() ===
|
|
9
|
+
options.wallet.getAdminAccount?.()?.address?.toLowerCase());
|
|
10
|
+
return isInAppOrEcosystem(options.wallet) || isSmartWalletWithAdmin;
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=is-in-app-signer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"is-in-app-signer.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/wallet/is-in-app-signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sDAAsD,CAAC;AAEzF,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,MAAM,UAAU,aAAa,CAAC,OAG7B;IACC,MAAM,kBAAkB,GAAG,CAAC,CAAS,EAAE,EAAE,CACvC,aAAa,CAAC,CAAC,CAAC,IAAI,iBAAiB,CAAC,CAAC,CAAC,CAAC;IAC3C,MAAM,sBAAsB,GAC1B,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC;QAC7B,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAC3B,CAAC,CAAC,EAAE,EAAE,CACJ,kBAAkB,CAAC,CAAC,CAAC;YACrB,CAAC,CAAC,UAAU,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE;gBACpC,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,CAC/D,CAAC;IACJ,OAAO,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,sBAAsB,CAAC;AACtE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectButton.d.ts","sourceRoot":"","sources":["../../../../../../src/react/native/ui/connect/ConnectButton.tsx"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAa/F;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,
|
|
1
|
+
{"version":3,"file":"ConnectButton.d.ts","sourceRoot":"","sources":["../../../../../../src/react/native/ui/connect/ConnectButton.tsx"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAa/F;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,8CA+ItD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectButton.d.ts","sourceRoot":"","sources":["../../../../../../src/react/web/ui/ConnectWallet/ConnectButton.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AA2B/F;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2PG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,
|
|
1
|
+
{"version":3,"file":"ConnectButton.d.ts","sourceRoot":"","sources":["../../../../../../src/react/web/ui/ConnectWallet/ConnectButton.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AA2B/F;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2PG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,8CAkHtD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectEmbed.d.ts","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/ConnectWallet/Modal/ConnectEmbed.tsx"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wDAAwD,CAAC;AAyBhG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4IG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"ConnectEmbed.d.ts","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/ConnectWallet/Modal/ConnectEmbed.tsx"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wDAAwD,CAAC;AAyBhG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4IG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,iBAAiB,8CA0HpD;AAqID,eAAO,MAAM,cAAc;;;;eACd,SAAS,GAAG,MAAM;yGAwB7B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OnRampScreen.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/react/web/ui/ConnectWallet/screens/Buy/fiat/OnRampScreen.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAM5E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kDAAkD,CAAC;AACzF,OAAO,EACL,KAAK,iBAAiB,EAEvB,MAAM,mDAAmD,CAAC;
|
|
1
|
+
{"version":3,"file":"OnRampScreen.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/react/web/ui/ConnectWallet/screens/Buy/fiat/OnRampScreen.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAM5E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kDAAkD,CAAC;AACzF,OAAO,EACL,KAAK,iBAAiB,EAEvB,MAAM,mDAAmD,CAAC;AA+B3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAe7C,wBAAgB,YAAY,CAAC,KAAK,EAAE;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,gBAAgB,CAAC;IACxB,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,MAAM,EAAE,cAAc,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,eAAe,EAAE,OAAO,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,SAAS,CAAC;IACjB,SAAS,EAAE,CAAC,MAAM,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC/C,eAAe,EAAE,MAAM,CAAC;CACzB,8CA4GA"}
|
|
@@ -5,7 +5,7 @@ import type { SmartWalletOptions } from "../../../wallets/smart/types.js";
|
|
|
5
5
|
import type { AppMetadata } from "../../../wallets/types.js";
|
|
6
6
|
import type { WalletId } from "../../../wallets/wallet-types.js";
|
|
7
7
|
import type { Theme } from "../../core/design-system/index.js";
|
|
8
|
-
import type
|
|
8
|
+
import { type SiweAuthOptions } from "../../core/hooks/auth/useSiweAuth.js";
|
|
9
9
|
import type { ConnectButton_connectModalOptions, PayUIOptions } from "../../core/hooks/connection/ConnectButtonProps.js";
|
|
10
10
|
import type { SupportedTokens } from "../../core/utils/defaultTokens.js";
|
|
11
11
|
import type { LocaleId } from "./types.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PayEmbed.d.ts","sourceRoot":"","sources":["../../../../../src/react/web/ui/PayEmbed.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AACpE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAEjE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"PayEmbed.d.ts","sourceRoot":"","sources":["../../../../../src/react/web/ui/PayEmbed.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AACpE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAEjE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EACL,KAAK,eAAe,EAErB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EACV,iCAAiC,EACjC,YAAY,EACb,MAAM,mDAAmD,CAAC;AAI3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAQzE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAmCG;IACH,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC;;;;;;;;;;;;;;OAcG;IACH,MAAM,EAAE,cAAc,CAAC;IACvB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,QAAQ,CAAC;IAClB;;OAEG;IACH,UAAU,CAAC,EAAE,YAAY,CAAC;IAE1B;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC;IAEjC;;;;OAIG;IACH,cAAc,CAAC,EAAE,sBAAsB,CAAC;IAExC;;OAEG;IACH,aAAa,CAAC,EAAE,QAAQ,EAAE,CAAC;IAE3B;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAE5B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0JG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,aAAa,8CAkH5C;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC;;;OAGG;IACH,YAAY,CAAC,EAAE,iCAAiC,CAAC;IAEjD;;;;;;;OAOG;IACH,aAAa,CAAC,EAAE;QACd,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IAEF;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IAExC;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB;;;;;;;;;OASG;IACH,WAAW,CAAC,EACR;QACE,OAAO,EAAE,MAAM,CAAC;KACjB,GACD,OAAO,CAAC;IAEZ;;OAEG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;IAE1B;;;;;;;;;;;;;OAaG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC;IAEd;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC;IAEjB;;OAEG;IACH,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAE9B;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,eAAe,CAAC;CACxB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-node.d.ts","sourceRoot":"","sources":["../../../../src/storage/upload/web-node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAK7D,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEhE,wBAAsB,WAAW,CAAC,KAAK,CAAC,MAAM,SAAS,cAAc,EAAE,EACrE,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,QAAQ,EACd,SAAS,EAAE,MAAM,EAAE,EACnB,OAAO,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"web-node.d.ts","sourceRoot":"","sources":["../../../../src/storage/upload/web-node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAK7D,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEhE,wBAAsB,WAAW,CAAC,KAAK,CAAC,MAAM,SAAS,cAAc,EAAE,EACrE,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,QAAQ,EACd,SAAS,EAAE,MAAM,EAAE,EACnB,OAAO,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,qBAqDhC"}
|
|
@@ -6,6 +6,7 @@ import { LruMap } from "./caching/lru.js";
|
|
|
6
6
|
*/
|
|
7
7
|
export declare function getClientFetch(client: ThirdwebClient, ecosystem?: Ecosystem): (url: string | Request, init?: Omit<RequestInit, "signal"> & {
|
|
8
8
|
requestTimeoutMs?: number;
|
|
9
|
+
useAuthToken?: boolean;
|
|
9
10
|
}) => Promise<Response>;
|
|
10
11
|
export declare const IS_THIRDWEB_URL_CACHE: LruMap<boolean>;
|
|
11
12
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../src/utils/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAY1C;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,SAAS,SAKnE,MAAM,GAAG,OAAO,SACd,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG;
|
|
1
|
+
{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../src/utils/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAY1C;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,SAAS,SAKnE,MAAM,GAAG,OAAO,SACd,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG;IACnC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,KACA,OAAO,CAAC,QAAQ,CAAC,CA4FrB;AAWD,eAAO,MAAM,qBAAqB,iBAA4B,CAAC;AAE/D;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAyBlD;AAwCD;;GAEG;AACH,wBAAgB,kBAAkB,uBA0BjC"}
|
package/dist/types/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "5.98.
|
|
1
|
+
export declare const version = "5.98.2";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autoConnectCore.d.ts","sourceRoot":"","sources":["../../../../src/wallets/connection/autoConnectCore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAIxE,OAAO,KAAK,EACV,YAAY,EACZ,mCAAmC,EACpC,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"autoConnectCore.d.ts","sourceRoot":"","sources":["../../../../src/wallets/connection/autoConnectCore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAIxE,OAAO,KAAK,EACV,YAAY,EACZ,mCAAmC,EACpC,MAAM,wCAAwC,CAAC;AAGhD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EACL,KAAK,iBAAiB,EAIvB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,KAAK,oBAAoB,GAAG;IAC1B,OAAO,EAAE,YAAY,CAAC;IACtB,KAAK,EAAE,gBAAgB,GAAG;QAAE,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAChD,cAAc,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,MAAM,CAAC;IACzC,OAAO,EAAE,iBAAiB,CAAC;IAC3B,eAAe,CAAC,EAAE,CAChB,UAAU,EAAE,MAAM,GAAG,CAAC,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC,KACzC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC5B,mBAAmB,CAAC,EAAE,MAAM,MAAM,EAAE,CAAC;IACrC,mBAAmB,CAAC,EAAE,CACpB,YAAY,EAAE,YAAY,CAAC,UAAU,CAAC,EACtC,OAAO,EAAE,YAAY,KAClB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAIF;;GAEG;AACH,eAAO,MAAM,eAAe,GAAU,OAAO,oBAAoB,qBAehE,CAAC;AA0JF;;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,sDAMA"}
|
|
@@ -110,5 +110,14 @@ export type AutoConnectProps = {
|
|
|
110
110
|
* Callback to be called when the connection is timeout-ed
|
|
111
111
|
*/
|
|
112
112
|
onTimeout?: () => void;
|
|
113
|
+
/**
|
|
114
|
+
* @hidden
|
|
115
|
+
*/
|
|
116
|
+
siweAuth?: {
|
|
117
|
+
requiresAuth: boolean;
|
|
118
|
+
doLogin: () => Promise<void>;
|
|
119
|
+
isLoggedIn: boolean | undefined;
|
|
120
|
+
isLoggingIn: boolean | undefined;
|
|
121
|
+
};
|
|
113
122
|
};
|
|
114
123
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/wallets/connection/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE1D,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;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/wallets/connection/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE1D,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;IAEvB;;OAEG;IACH,QAAQ,CAAC,EAAE;QACT,YAAY,EAAE,OAAO,CAAC;QACtB,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7B,UAAU,EAAE,OAAO,GAAG,SAAS,CAAC;QAChC,WAAW,EAAE,OAAO,GAAG,SAAS,CAAC;KAClC,CAAC;CACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/wallets/engine/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAInD,OAAO,KAAK,EAAE,OAAO,EAAyB,MAAM,yBAAyB,CAAC;AAE9E;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE;QACV;;WAEG;QACH,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB;;WAEG;QACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;QAC/B;;WAEG;QACH,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IACF;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC;CACf,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/wallets/engine/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAInD,OAAO,KAAK,EAAE,OAAO,EAAyB,MAAM,yBAAyB,CAAC;AAE9E;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE;QACV;;WAEG;QACH,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB;;WAEG;QACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;QAC/B;;WAEG;QACH,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IACF;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC;CACf,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAgKpE"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"is-in-app-signer.d.ts","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/wallet/is-in-app-signer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAI5D,wBAAgB,aAAa,CAAC,OAAO,EAAE;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,WAYA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "thirdweb",
|
|
3
|
-
"version": "5.98.
|
|
3
|
+
"version": "5.98.2",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "git+https://github.com/thirdweb-dev/js.git#main"
|
|
@@ -260,7 +260,7 @@
|
|
|
260
260
|
"@mobile-wallet-protocol/client": "^1",
|
|
261
261
|
"@react-native-async-storage/async-storage": "^1 || ^2",
|
|
262
262
|
"ethers": "^5 || ^6",
|
|
263
|
-
"expo-linking": "^6",
|
|
263
|
+
"expo-linking": "^6 || ^7",
|
|
264
264
|
"expo-web-browser": "^13 || ^14",
|
|
265
265
|
"react": "^18 || ^19",
|
|
266
266
|
"react-native": "*",
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { describe, expect, test } from "vitest";
|
|
2
|
+
import { ANVIL_CHAIN } from "../../test/src/chains.js";
|
|
2
3
|
import { TEST_CLIENT } from "../../test/src/test-clients.js";
|
|
3
4
|
import { ANVIL_PKEY_A, TEST_ACCOUNT_A } from "../../test/src/test-wallets.js";
|
|
4
5
|
import { typedData } from "../../test/src/typed-data.js";
|
|
@@ -20,7 +21,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("verifyTypedData", async () => {
|
|
|
20
21
|
primaryType: "Mail",
|
|
21
22
|
address: TEST_ACCOUNT_A.address,
|
|
22
23
|
signature,
|
|
23
|
-
chain:
|
|
24
|
+
chain: ANVIL_CHAIN,
|
|
24
25
|
client: TEST_CLIENT,
|
|
25
26
|
}),
|
|
26
27
|
).toBe(true);
|
|
@@ -33,7 +34,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("verifyTypedData", async () => {
|
|
|
33
34
|
primaryType: "Mail",
|
|
34
35
|
address: TEST_ACCOUNT_A.address,
|
|
35
36
|
signature: "0xdead",
|
|
36
|
-
chain:
|
|
37
|
+
chain: ANVIL_CHAIN,
|
|
37
38
|
client: TEST_CLIENT,
|
|
38
39
|
}),
|
|
39
40
|
).toBe(false);
|
|
@@ -74,7 +75,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("verifyTypedData", async () => {
|
|
|
74
75
|
address: "0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
|
|
75
76
|
signature:
|
|
76
77
|
"0x79d756d805073dc97b7bc885b0d56ddf319a2599530fe1e178c2a7de5be88980068d24f20a79b318ea0a84d33ae06f93db77e4235e5d9eeb8b1d7a63922ada3e1c",
|
|
77
|
-
chain:
|
|
78
|
+
chain: ANVIL_CHAIN,
|
|
78
79
|
client: TEST_CLIENT,
|
|
79
80
|
}),
|
|
80
81
|
).toBe(false);
|
|
@@ -47,7 +47,10 @@ export function ConnectButton(props: ConnectButtonProps) {
|
|
|
47
47
|
const status = useActiveWalletConnectionStatus();
|
|
48
48
|
const connectionManager = useConnectionManager();
|
|
49
49
|
const siweAuth = useSiweAuth(wallet, account, props.auth);
|
|
50
|
-
useAutoConnect(
|
|
50
|
+
useAutoConnect({
|
|
51
|
+
...props,
|
|
52
|
+
siweAuth: siweAuth,
|
|
53
|
+
});
|
|
51
54
|
|
|
52
55
|
const fadeAnim = useRef(new Animated.Value(0)); // For background opacity
|
|
53
56
|
const slideAnim = useRef(new Animated.Value(screenHeight)); // For bottom sheet position
|
|
@@ -297,6 +297,9 @@ export function ConnectButton(props: ConnectButtonProps) {
|
|
|
297
297
|
);
|
|
298
298
|
const localeQuery = useConnectLocale(props.locale || "en_US");
|
|
299
299
|
const connectionManager = useConnectionManager();
|
|
300
|
+
const activeAccount = useActiveAccount();
|
|
301
|
+
const activeWallet = useActiveWallet();
|
|
302
|
+
const siweAuth = useSiweAuth(activeWallet, activeAccount, props.auth);
|
|
300
303
|
|
|
301
304
|
usePreloadWalletProviders({
|
|
302
305
|
wallets,
|
|
@@ -337,6 +340,7 @@ export function ConnectButton(props: ConnectButtonProps) {
|
|
|
337
340
|
}
|
|
338
341
|
accountAbstraction={props.accountAbstraction}
|
|
339
342
|
onConnect={props.onConnect}
|
|
343
|
+
siweAuth={siweAuth}
|
|
340
344
|
/>
|
|
341
345
|
);
|
|
342
346
|
|
|
@@ -362,7 +366,11 @@ export function ConnectButton(props: ConnectButtonProps) {
|
|
|
362
366
|
|
|
363
367
|
return (
|
|
364
368
|
<WalletUIStatesProvider theme={props.theme} isOpen={false}>
|
|
365
|
-
<ConnectButtonInner
|
|
369
|
+
<ConnectButtonInner
|
|
370
|
+
{...props}
|
|
371
|
+
siweAuth={siweAuth}
|
|
372
|
+
connectLocale={localeQuery.data}
|
|
373
|
+
/>
|
|
366
374
|
<ConnectModal
|
|
367
375
|
shouldSetActive={true}
|
|
368
376
|
accountAbstraction={props.accountAbstraction}
|
|
@@ -396,11 +404,11 @@ export function ConnectButton(props: ConnectButtonProps) {
|
|
|
396
404
|
function ConnectButtonInner(
|
|
397
405
|
props: ConnectButtonProps & {
|
|
398
406
|
connectLocale: ConnectLocale;
|
|
407
|
+
siweAuth: ReturnType<typeof useSiweAuth>;
|
|
399
408
|
},
|
|
400
409
|
) {
|
|
401
|
-
const
|
|
410
|
+
const siweAuth = props.siweAuth;
|
|
402
411
|
const activeAccount = useActiveAccount();
|
|
403
|
-
const siweAuth = useSiweAuth(activeWallet, activeAccount, props.auth);
|
|
404
412
|
const [showSignatureModal, setShowSignatureModal] = useState(false);
|
|
405
413
|
|
|
406
414
|
// if wallet gets disconnected suddently, close the signature modal if it's open
|
|
@@ -247,6 +247,7 @@ export function ConnectEmbed(props: ConnectEmbedProps) {
|
|
|
247
247
|
chain={preferredChain}
|
|
248
248
|
appMetadata={props.appMetadata}
|
|
249
249
|
client={props.client}
|
|
250
|
+
siweAuth={siweAuth}
|
|
250
251
|
wallets={wallets}
|
|
251
252
|
accountAbstraction={props.accountAbstraction}
|
|
252
253
|
timeout={
|
|
@@ -23,10 +23,7 @@ import { sendTransaction } from "../../../../../../../transaction/actions/send-t
|
|
|
23
23
|
import type { WaitForReceiptOptions } from "../../../../../../../transaction/actions/wait-for-tx-receipt.js";
|
|
24
24
|
import { waitForReceipt } from "../../../../../../../transaction/actions/wait-for-tx-receipt.js";
|
|
25
25
|
import { formatNumber } from "../../../../../../../utils/formatNumber.js";
|
|
26
|
-
import {
|
|
27
|
-
import { isInAppWallet } from "../../../../../../../wallets/in-app/core/wallet/index.js";
|
|
28
|
-
import type { Wallet } from "../../../../../../../wallets/interfaces/wallet.js";
|
|
29
|
-
import { isSmartWallet } from "../../../../../../../wallets/smart/is-smart-wallet.js";
|
|
26
|
+
import { isInAppSigner } from "../../../../../../../wallets/in-app/core/wallet/is-in-app-signer.js";
|
|
30
27
|
import { spacing } from "../../../../../../core/design-system/index.js";
|
|
31
28
|
import { useChainName } from "../../../../../../core/hooks/others/useChainQuery.js";
|
|
32
29
|
import { useBuyWithCryptoStatus } from "../../../../../../core/hooks/pay/useBuyWithCryptoStatus.js";
|
|
@@ -779,20 +776,3 @@ function useSwapMutation(props: {
|
|
|
779
776
|
},
|
|
780
777
|
});
|
|
781
778
|
}
|
|
782
|
-
|
|
783
|
-
function isInAppSigner(options: {
|
|
784
|
-
wallet: Wallet;
|
|
785
|
-
connectedWallets: Wallet[];
|
|
786
|
-
}) {
|
|
787
|
-
const isInAppOrEcosystem = (w: Wallet) =>
|
|
788
|
-
isInAppWallet(w) || isEcosystemWallet(w);
|
|
789
|
-
const isSmartWalletWithAdmin =
|
|
790
|
-
isSmartWallet(options.wallet) &&
|
|
791
|
-
options.connectedWallets.some(
|
|
792
|
-
(w) =>
|
|
793
|
-
isInAppOrEcosystem(w) &&
|
|
794
|
-
w.getAccount()?.address?.toLowerCase() ===
|
|
795
|
-
options.wallet.getAdminAccount?.()?.address?.toLowerCase(),
|
|
796
|
-
);
|
|
797
|
-
return isInAppOrEcosystem(options.wallet) || isSmartWalletWithAdmin;
|
|
798
|
-
}
|
|
@@ -9,13 +9,19 @@ import type { AppMetadata } from "../../../wallets/types.js";
|
|
|
9
9
|
import type { WalletId } from "../../../wallets/wallet-types.js";
|
|
10
10
|
import { CustomThemeProvider } from "../../core/design-system/CustomThemeProvider.js";
|
|
11
11
|
import type { Theme } from "../../core/design-system/index.js";
|
|
12
|
-
import
|
|
12
|
+
import {
|
|
13
|
+
type SiweAuthOptions,
|
|
14
|
+
useSiweAuth,
|
|
15
|
+
} from "../../core/hooks/auth/useSiweAuth.js";
|
|
13
16
|
import type {
|
|
14
17
|
ConnectButton_connectModalOptions,
|
|
15
18
|
PayUIOptions,
|
|
16
19
|
} from "../../core/hooks/connection/ConnectButtonProps.js";
|
|
20
|
+
import { useActiveAccount } from "../../core/hooks/wallets/useActiveAccount.js";
|
|
21
|
+
import { useActiveWallet } from "../../core/hooks/wallets/useActiveWallet.js";
|
|
17
22
|
import { useConnectionManager } from "../../core/providers/connection-manager.js";
|
|
18
23
|
import type { SupportedTokens } from "../../core/utils/defaultTokens.js";
|
|
24
|
+
import { AutoConnect } from "../../web/ui/AutoConnect/AutoConnect.js";
|
|
19
25
|
import { EmbedContainer } from "./ConnectWallet/Modal/ConnectEmbed.js";
|
|
20
26
|
import { useConnectLocale } from "./ConnectWallet/locale/getConnectLocale.js";
|
|
21
27
|
import BuyScreen from "./ConnectWallet/screens/Buy/BuyScreen.js";
|
|
@@ -300,6 +306,13 @@ export function PayEmbed(props: PayEmbedProps) {
|
|
|
300
306
|
const [screen, setScreen] = useState<"buy" | "execute-tx">("buy");
|
|
301
307
|
const theme = props.theme || "dark";
|
|
302
308
|
const connectionManager = useConnectionManager();
|
|
309
|
+
const activeAccount = useActiveAccount();
|
|
310
|
+
const activeWallet = useActiveWallet();
|
|
311
|
+
const siweAuth = useSiweAuth(
|
|
312
|
+
activeWallet,
|
|
313
|
+
activeAccount,
|
|
314
|
+
props.connectOptions?.auth,
|
|
315
|
+
);
|
|
303
316
|
|
|
304
317
|
// Add props.chain and props.chains to defined chains store
|
|
305
318
|
useEffect(() => {
|
|
@@ -342,6 +355,7 @@ export function PayEmbed(props: PayEmbedProps) {
|
|
|
342
355
|
} else {
|
|
343
356
|
content = (
|
|
344
357
|
<>
|
|
358
|
+
<AutoConnect client={props.client} siweAuth={siweAuth} />
|
|
345
359
|
{screen === "buy" && (
|
|
346
360
|
<BuyScreen
|
|
347
361
|
title={metadata?.name || "Buy"}
|
package/src/utils/fetch.test.ts
CHANGED
|
@@ -52,7 +52,7 @@ describe("getClientFetch", () => {
|
|
|
52
52
|
);
|
|
53
53
|
});
|
|
54
54
|
|
|
55
|
-
it("should send a bearer token if secret key is a JWT", () => {
|
|
55
|
+
it("should NOT send a bearer token if secret key is a JWT", () => {
|
|
56
56
|
vi.spyOn(global, "fetch").mockResolvedValue(new Response());
|
|
57
57
|
const clientFetch = getClientFetch({
|
|
58
58
|
clientId: "test-client-id",
|
|
@@ -67,6 +67,28 @@ describe("getClientFetch", () => {
|
|
|
67
67
|
}),
|
|
68
68
|
);
|
|
69
69
|
|
|
70
|
+
// biome-ignore lint/suspicious/noExplicitAny: `any` type ok for tests
|
|
71
|
+
const headers = (global.fetch as any).mock.calls[0][1].headers;
|
|
72
|
+
expect(headers.get("authorization")).toBe(null);
|
|
73
|
+
});
|
|
74
|
+
|
|
75
|
+
it("should send a bearer token if secret key is a JWT and useAuthToken is true", () => {
|
|
76
|
+
vi.spyOn(global, "fetch").mockResolvedValue(new Response());
|
|
77
|
+
const clientFetch = getClientFetch({
|
|
78
|
+
clientId: "test-client-id",
|
|
79
|
+
secretKey: "foo.bar.baz",
|
|
80
|
+
});
|
|
81
|
+
clientFetch("https://api.thirdweb.com/test", {
|
|
82
|
+
useAuthToken: true,
|
|
83
|
+
});
|
|
84
|
+
|
|
85
|
+
expect(global.fetch).toHaveBeenCalledWith(
|
|
86
|
+
"https://api.thirdweb.com/test",
|
|
87
|
+
expect.objectContaining({
|
|
88
|
+
headers: expect.any(Headers),
|
|
89
|
+
}),
|
|
90
|
+
);
|
|
91
|
+
|
|
70
92
|
// biome-ignore lint/suspicious/noExplicitAny: `any` type ok for tests
|
|
71
93
|
const headers = (global.fetch as any).mock.calls[0][1].headers;
|
|
72
94
|
expect(headers.get("authorization")).toBe("Bearer foo.bar.baz");
|
package/src/utils/fetch.ts
CHANGED
|
@@ -22,10 +22,16 @@ export function getClientFetch(client: ThirdwebClient, ecosystem?: Ecosystem) {
|
|
|
22
22
|
*/
|
|
23
23
|
async function fetchWithHeaders(
|
|
24
24
|
url: string | Request,
|
|
25
|
-
init?: Omit<RequestInit, "signal"> & {
|
|
25
|
+
init?: Omit<RequestInit, "signal"> & {
|
|
26
|
+
requestTimeoutMs?: number;
|
|
27
|
+
useAuthToken?: boolean;
|
|
28
|
+
},
|
|
26
29
|
): Promise<Response> {
|
|
27
|
-
const {
|
|
28
|
-
|
|
30
|
+
const {
|
|
31
|
+
requestTimeoutMs = DEFAULT_REQUEST_TIMEOUT,
|
|
32
|
+
useAuthToken,
|
|
33
|
+
...restInit
|
|
34
|
+
} = init || {};
|
|
29
35
|
|
|
30
36
|
let headers = restInit.headers
|
|
31
37
|
? new Headers(restInit.headers)
|
|
@@ -41,7 +47,7 @@ export function getClientFetch(client: ThirdwebClient, ecosystem?: Ecosystem) {
|
|
|
41
47
|
}
|
|
42
48
|
// auth token if secret key === jwt
|
|
43
49
|
const authToken =
|
|
44
|
-
client.secretKey && isJWT(client.secretKey)
|
|
50
|
+
useAuthToken && client.secretKey && isJWT(client.secretKey)
|
|
45
51
|
? client.secretKey
|
|
46
52
|
: undefined;
|
|
47
53
|
// secret key if secret key !== jwt
|
|
@@ -64,14 +70,15 @@ export function getClientFetch(client: ThirdwebClient, ecosystem?: Ecosystem) {
|
|
|
64
70
|
if (client.teamId) {
|
|
65
71
|
headers.set("x-team-id", client.teamId);
|
|
66
72
|
}
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
73
|
+
} else {
|
|
74
|
+
// only set secret key or client id if we are NOT using the auth token!
|
|
75
|
+
if (secretKey) {
|
|
76
|
+
headers.set("x-secret-key", secretKey);
|
|
77
|
+
}
|
|
72
78
|
|
|
73
|
-
|
|
74
|
-
|
|
79
|
+
if (clientId) {
|
|
80
|
+
headers.set("x-client-id", clientId);
|
|
81
|
+
}
|
|
75
82
|
}
|
|
76
83
|
|
|
77
84
|
if (ecosystem) {
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = "5.98.
|
|
1
|
+
export const version = "5.98.2";
|