thirdweb 5.80.1-nightly-a3f59e50e249d8b4fac765e025fc2cd102093e9c-20250105000328 → 5.81.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/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/version.js.map +1 -1
- package/dist/cjs/wallets/in-app/core/wallet/in-app-core.js +9 -3
- 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 +8 -10
- package/dist/cjs/wallets/in-app/core/wallet/index.js.map +1 -1
- package/dist/cjs/wallets/injected/index.js +2 -1
- package/dist/cjs/wallets/injected/index.js.map +1 -1
- package/dist/cjs/wallets/smart/index.js +14 -13
- package/dist/cjs/wallets/smart/index.js.map +1 -1
- package/dist/cjs/wallets/smart/smart-wallet.js +12 -10
- package/dist/cjs/wallets/smart/smart-wallet.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/version.js.map +1 -1
- package/dist/esm/wallets/in-app/core/wallet/in-app-core.js +9 -3
- 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 +8 -10
- package/dist/esm/wallets/in-app/core/wallet/index.js.map +1 -1
- package/dist/esm/wallets/injected/index.js +2 -1
- package/dist/esm/wallets/injected/index.js.map +1 -1
- package/dist/esm/wallets/smart/index.js +12 -11
- package/dist/esm/wallets/smart/index.js.map +1 -1
- package/dist/esm/wallets/smart/smart-wallet.js +12 -10
- package/dist/esm/wallets/smart/smart-wallet.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/version.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 +10 -2
- package/dist/types/wallets/in-app/core/wallet/index.d.ts.map +1 -1
- package/dist/types/wallets/injected/index.d.ts.map +1 -1
- package/dist/types/wallets/smart/index.d.ts +2 -2
- package/dist/types/wallets/smart/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/core/wallet/in-app-core.test.ts +115 -54
- package/src/wallets/in-app/core/wallet/in-app-core.ts +22 -11
- package/src/wallets/in-app/core/wallet/index.ts +10 -13
- package/src/wallets/in-app/web/lib/get-url-token.test.tsx +92 -0
- package/src/wallets/injected/index.ts +2 -1
- package/src/wallets/smart/index.ts +14 -18
- package/src/wallets/smart/smart-wallet.ts +13 -13
- package/src/wallets/smart/smart.test.ts +19 -39
|
@@ -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
package/dist/cjs/version.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,OAAO,GAAG,QAAQ,CAAC"}
|
|
@@ -29,6 +29,7 @@ function createInAppWallet(args) {
|
|
|
29
29
|
const emitter = (0, wallet_emitter_js_1.createWalletEmitter)();
|
|
30
30
|
let createOptions = _createOptions;
|
|
31
31
|
let account = undefined;
|
|
32
|
+
let adminAccount = undefined; // Admin account if smartAccountOptions were provided with connection
|
|
32
33
|
let chain = undefined;
|
|
33
34
|
let client;
|
|
34
35
|
return {
|
|
@@ -66,10 +67,11 @@ function createInAppWallet(args) {
|
|
|
66
67
|
};
|
|
67
68
|
}
|
|
68
69
|
}
|
|
69
|
-
const
|
|
70
|
+
const { account: connectedAccount, chain: connectedChain, adminAccount: _adminAccount, } = await autoConnectInAppWallet(options, createOptions, connector);
|
|
70
71
|
// set the states
|
|
71
72
|
client = options.client;
|
|
72
73
|
account = connectedAccount;
|
|
74
|
+
adminAccount = _adminAccount;
|
|
73
75
|
chain = connectedChain;
|
|
74
76
|
(0, connect_js_1.trackConnect)({
|
|
75
77
|
client: options.client,
|
|
@@ -104,10 +106,11 @@ function createInAppWallet(args) {
|
|
|
104
106
|
};
|
|
105
107
|
}
|
|
106
108
|
}
|
|
107
|
-
const
|
|
109
|
+
const { account: connectedAccount, chain: connectedChain, adminAccount: _adminAccount, } = await connectInAppWallet(options, createOptions, connector);
|
|
108
110
|
// set the states
|
|
109
111
|
client = options.client;
|
|
110
112
|
account = connectedAccount;
|
|
113
|
+
adminAccount = _adminAccount;
|
|
111
114
|
chain = connectedChain;
|
|
112
115
|
(0, connect_js_1.trackConnect)({
|
|
113
116
|
client: options.client,
|
|
@@ -129,6 +132,7 @@ function createInAppWallet(args) {
|
|
|
129
132
|
}
|
|
130
133
|
}
|
|
131
134
|
account = undefined;
|
|
135
|
+
adminAccount = undefined;
|
|
132
136
|
chain = undefined;
|
|
133
137
|
emitter.emit("disconnect", undefined);
|
|
134
138
|
},
|
|
@@ -151,10 +155,11 @@ function createInAppWallet(args) {
|
|
|
151
155
|
};
|
|
152
156
|
}
|
|
153
157
|
}
|
|
154
|
-
const
|
|
158
|
+
const { account: connectedAccount, chain: connectedChain, adminAccount: _adminAccount, } = await autoConnectInAppWallet({
|
|
155
159
|
chain: newChain,
|
|
156
160
|
client,
|
|
157
161
|
}, createOptions, connector);
|
|
162
|
+
adminAccount = _adminAccount;
|
|
158
163
|
account = connectedAccount;
|
|
159
164
|
chain = connectedChain;
|
|
160
165
|
}
|
|
@@ -164,6 +169,7 @@ function createInAppWallet(args) {
|
|
|
164
169
|
}
|
|
165
170
|
emitter.emit("chainChanged", newChain);
|
|
166
171
|
},
|
|
172
|
+
getAdminAccount: () => adminAccount,
|
|
167
173
|
};
|
|
168
174
|
}
|
|
169
175
|
//# sourceMappingURL=in-app-core.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"in-app-core.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/wallet/in-app-core.ts"],"names":[],"mappings":";;AAuBA,0EAYC;AAKD,
|
|
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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"}
|
|
@@ -36,14 +36,15 @@ async function connectInAppWallet(options, createOptions, connector) {
|
|
|
36
36
|
if (createOptions &&
|
|
37
37
|
"smartAccount" in createOptions &&
|
|
38
38
|
createOptions?.smartAccount) {
|
|
39
|
-
|
|
39
|
+
const [account, chain] = await convertToSmartAccount({
|
|
40
40
|
client: options.client,
|
|
41
41
|
authAccount,
|
|
42
42
|
smartAccountOptions: createOptions.smartAccount,
|
|
43
43
|
chain: options.chain,
|
|
44
44
|
});
|
|
45
|
+
return { account, chain, adminAccount: authAccount };
|
|
45
46
|
}
|
|
46
|
-
return
|
|
47
|
+
return { account: authAccount, chain: options.chain || ethereum_js_1.ethereum };
|
|
47
48
|
}
|
|
48
49
|
/**
|
|
49
50
|
* @internal
|
|
@@ -60,22 +61,19 @@ async function autoConnectInAppWallet(options, createOptions, connector) {
|
|
|
60
61
|
if (createOptions &&
|
|
61
62
|
"smartAccount" in createOptions &&
|
|
62
63
|
createOptions?.smartAccount) {
|
|
63
|
-
|
|
64
|
+
const [account, chain] = await convertToSmartAccount({
|
|
64
65
|
client: options.client,
|
|
65
66
|
authAccount,
|
|
66
67
|
smartAccountOptions: createOptions.smartAccount,
|
|
67
68
|
chain: options.chain,
|
|
68
69
|
});
|
|
70
|
+
return { account, chain, adminAccount: authAccount };
|
|
69
71
|
}
|
|
70
|
-
return
|
|
72
|
+
return { account: authAccount, chain: options.chain || ethereum_js_1.ethereum };
|
|
71
73
|
}
|
|
72
74
|
async function convertToSmartAccount(options) {
|
|
73
|
-
const
|
|
74
|
-
|
|
75
|
-
Promise.resolve().then(() => require("../../../smart/index.js")),
|
|
76
|
-
]);
|
|
77
|
-
const sa = smartWallet(options.smartAccountOptions);
|
|
78
|
-
return connectSmartWallet(sa, {
|
|
75
|
+
const { connectSmartAccount } = await Promise.resolve().then(() => require("../../../smart/index.js"));
|
|
76
|
+
return connectSmartAccount({
|
|
79
77
|
client: options.client,
|
|
80
78
|
personalAccount: options.authAccount,
|
|
81
79
|
chain: options.chain,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/wallet/index.ts"],"names":[],"mappings":";;AAsBA,sCAIC;AAKD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/wallet/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.isSmartWallet = isSmartWallet;
|
|
4
|
-
exports.
|
|
5
|
-
exports.
|
|
4
|
+
exports.connectSmartAccount = connectSmartAccount;
|
|
5
|
+
exports.disconnectSmartAccount = disconnectSmartAccount;
|
|
6
6
|
const utils_js_1 = require("../../chains/utils.js");
|
|
7
7
|
const contract_js_1 = require("../../contract/contract.js");
|
|
8
8
|
const allowance_js_1 = require("../../extensions/erc20/__generated__/IERC20/read/allowance.js");
|
|
@@ -28,18 +28,19 @@ function isSmartWallet(wallet) {
|
|
|
28
28
|
return wallet.id === "smart";
|
|
29
29
|
}
|
|
30
30
|
/**
|
|
31
|
-
*
|
|
31
|
+
* For in-app wallets, the smart wallet creation is implicit so we track these to be able to retrieve the personal account for a smart account on the wallet API.
|
|
32
|
+
* Note: We have to go account to account here and NOT wallet to account because the smart wallet itself is never exposed to the in-app wallet, only the account.
|
|
32
33
|
* @internal
|
|
33
34
|
*/
|
|
34
|
-
const
|
|
35
|
-
const
|
|
35
|
+
const adminAccountToSmartAccountMap = new WeakMap();
|
|
36
|
+
const smartAccountToAdminAccountMap = new WeakMap();
|
|
36
37
|
/**
|
|
37
38
|
* @internal
|
|
38
39
|
*/
|
|
39
|
-
async function
|
|
40
|
+
async function connectSmartAccount(connectionOptions, creationOptions) {
|
|
40
41
|
const { personalAccount, client, chain: connectChain } = connectionOptions;
|
|
41
42
|
if (!personalAccount) {
|
|
42
|
-
throw new Error("
|
|
43
|
+
throw new Error("No personal account provided for smart account connection");
|
|
43
44
|
}
|
|
44
45
|
const options = creationOptions;
|
|
45
46
|
const chain = connectChain ?? options.chain;
|
|
@@ -105,20 +106,20 @@ async function connectSmartWallet(wallet, connectionOptions, creationOptions) {
|
|
|
105
106
|
factoryContract,
|
|
106
107
|
client,
|
|
107
108
|
});
|
|
108
|
-
|
|
109
|
-
|
|
109
|
+
adminAccountToSmartAccountMap.set(personalAccount, account);
|
|
110
|
+
smartAccountToAdminAccountMap.set(account, personalAccount);
|
|
110
111
|
return [account, chain];
|
|
111
112
|
}
|
|
112
113
|
/**
|
|
113
114
|
* @internal
|
|
114
115
|
*/
|
|
115
|
-
async function
|
|
116
|
+
async function disconnectSmartAccount(account) {
|
|
116
117
|
// look up the personalAccount for the smart wallet
|
|
117
|
-
const personalAccount =
|
|
118
|
+
const personalAccount = smartAccountToAdminAccountMap.get(account);
|
|
118
119
|
if (personalAccount) {
|
|
119
120
|
// remove the mappings
|
|
120
|
-
|
|
121
|
-
|
|
121
|
+
adminAccountToSmartAccountMap.delete(personalAccount);
|
|
122
|
+
smartAccountToAdminAccountMap.delete(account);
|
|
122
123
|
}
|
|
123
124
|
}
|
|
124
125
|
async function createSmartAccount(options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/wallets/smart/index.ts"],"names":[],"mappings":";;AAgEA,sCAIC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/wallets/smart/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -132,7 +132,7 @@ function smartWallet(createOptions) {
|
|
|
132
132
|
let adminAccount = undefined;
|
|
133
133
|
let chain = undefined;
|
|
134
134
|
let lastConnectOptions;
|
|
135
|
-
|
|
135
|
+
return {
|
|
136
136
|
id: "smart",
|
|
137
137
|
subscribe: emitter.subscribe,
|
|
138
138
|
getChain() {
|
|
@@ -146,8 +146,8 @@ function smartWallet(createOptions) {
|
|
|
146
146
|
getAccount: () => account,
|
|
147
147
|
getAdminAccount: () => adminAccount,
|
|
148
148
|
autoConnect: async (options) => {
|
|
149
|
-
const { connectSmartWallet } = await Promise.resolve().then(() => require("./index.js"));
|
|
150
|
-
const [connectedAccount, connectedChain] = await connectSmartWallet(
|
|
149
|
+
const { connectSmartAccount: connectSmartWallet } = await Promise.resolve().then(() => require("./index.js"));
|
|
150
|
+
const [connectedAccount, connectedChain] = await connectSmartWallet(options, createOptions);
|
|
151
151
|
// set the states
|
|
152
152
|
lastConnectOptions = options;
|
|
153
153
|
account = connectedAccount;
|
|
@@ -162,8 +162,8 @@ function smartWallet(createOptions) {
|
|
|
162
162
|
return account;
|
|
163
163
|
},
|
|
164
164
|
connect: async (options) => {
|
|
165
|
-
const {
|
|
166
|
-
const [connectedAccount, connectedChain] = await
|
|
165
|
+
const { connectSmartAccount } = await Promise.resolve().then(() => require("./index.js"));
|
|
166
|
+
const [connectedAccount, connectedChain] = await connectSmartAccount(options, createOptions);
|
|
167
167
|
// set the states
|
|
168
168
|
adminAccount = options.personalAccount;
|
|
169
169
|
lastConnectOptions = options;
|
|
@@ -180,10 +180,13 @@ function smartWallet(createOptions) {
|
|
|
180
180
|
return account;
|
|
181
181
|
},
|
|
182
182
|
disconnect: async () => {
|
|
183
|
+
if (account) {
|
|
184
|
+
const { disconnectSmartAccount } = await Promise.resolve().then(() => require("./index.js"));
|
|
185
|
+
await disconnectSmartAccount(account);
|
|
186
|
+
}
|
|
183
187
|
account = undefined;
|
|
188
|
+
adminAccount = undefined;
|
|
184
189
|
chain = undefined;
|
|
185
|
-
const { disconnectSmartWallet } = await Promise.resolve().then(() => require("./index.js"));
|
|
186
|
-
await disconnectSmartWallet(_smartWallet);
|
|
187
190
|
emitter.emit("disconnect", undefined);
|
|
188
191
|
},
|
|
189
192
|
switchChain: async (newChain) => {
|
|
@@ -204,14 +207,13 @@ function smartWallet(createOptions) {
|
|
|
204
207
|
throw new Error(`Factory contract not deployed on chain: ${newChain.id}`);
|
|
205
208
|
}
|
|
206
209
|
}
|
|
207
|
-
const {
|
|
208
|
-
const [connectedAccount, connectedChain] = await
|
|
210
|
+
const { connectSmartAccount } = await Promise.resolve().then(() => require("./index.js"));
|
|
211
|
+
const [connectedAccount, connectedChain] = await connectSmartAccount({ ...lastConnectOptions, chain: newChain }, createOptions);
|
|
209
212
|
// set the states
|
|
210
213
|
account = connectedAccount;
|
|
211
214
|
chain = connectedChain;
|
|
212
215
|
emitter.emit("chainChanged", newChain);
|
|
213
216
|
},
|
|
214
217
|
};
|
|
215
|
-
return _smartWallet;
|
|
216
218
|
}
|
|
217
219
|
//# sourceMappingURL=smart-wallet.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smart-wallet.js","sourceRoot":"","sources":["../../../../src/wallets/smart/smart-wallet.ts"],"names":[],"mappings":";;AAkIA,kCA6GC;AA/OD,iEAAgE;AAEhE,oDAA+D;AAC/D,4DAAyD;AACzD,kFAA4E;AAC5E,0FAAkF;AAElF,4DAA2D;AAE3D,qDAA8D;AAG9D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqHG;AACH,SAAgB,WAAW,CACzB,aAAiC;IAEjC,MAAM,OAAO,GAAG,IAAA,uCAAmB,GAAW,CAAC;IAC/C,IAAI,OAAO,GAAwB,SAAS,CAAC;IAC7C,IAAI,YAAY,GAAwB,SAAS,CAAC;IAClD,IAAI,KAAK,GAAsB,SAAS,CAAC;IACzC,IAAI,kBAA+D,CAAC;IAEpE,
|
|
1
|
+
{"version":3,"file":"smart-wallet.js","sourceRoot":"","sources":["../../../../src/wallets/smart/smart-wallet.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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"}
|