thirdweb 5.73.0-nightly-ea855c66cb940d1adafefaad6dd689227701d277-20241203000359 → 5.73.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/react/core/hooks/wallets/useConnect.js +8 -1
- package/dist/cjs/react/core/hooks/wallets/useConnect.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/actions/get-enclave-user-status.js +1 -1
- package/dist/cjs/wallets/in-app/core/actions/get-enclave-user-status.js.map +1 -1
- package/dist/cjs/wallets/manager/index.js +27 -20
- package/dist/cjs/wallets/manager/index.js.map +1 -1
- package/dist/cjs/wallets/smart/lib/paymaster.js +4 -0
- package/dist/cjs/wallets/smart/lib/paymaster.js.map +1 -1
- package/dist/esm/react/core/hooks/wallets/useConnect.js +8 -1
- package/dist/esm/react/core/hooks/wallets/useConnect.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/actions/get-enclave-user-status.js +1 -1
- package/dist/esm/wallets/in-app/core/actions/get-enclave-user-status.js.map +1 -1
- package/dist/esm/wallets/manager/index.js +27 -20
- package/dist/esm/wallets/manager/index.js.map +1 -1
- package/dist/esm/wallets/smart/lib/paymaster.js +4 -0
- package/dist/esm/wallets/smart/lib/paymaster.js.map +1 -1
- package/dist/types/react/core/hooks/wallets/useConnect.d.ts +8 -1
- package/dist/types/react/core/hooks/wallets/useConnect.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/manager/index.d.ts.map +1 -1
- package/dist/types/wallets/smart/lib/paymaster.d.ts.map +1 -1
- package/package.json +4 -3
- package/src/react/core/hooks/wallets/useConnect.ts +8 -1
- package/src/version.ts +1 -1
- package/src/wallets/in-app/core/actions/get-enclave-user-status.ts +1 -1
- package/src/wallets/manager/connection-manager.test.ts +68 -0
- package/src/wallets/manager/index.ts +39 -20
- package/src/wallets/smart/lib/paymaster.ts +7 -0
|
@@ -10,9 +10,14 @@ const useSetActiveWalletConnectionStatus_js_1 = require("./useSetActiveWalletCon
|
|
|
10
10
|
* @returns A function that lets you connect a wallet.
|
|
11
11
|
* @example
|
|
12
12
|
* ```jsx
|
|
13
|
+
* import { createThirdwebClient } from "thirdweb";
|
|
13
14
|
* import { useConnect } from "thirdweb/react";
|
|
14
15
|
* import { createWallet } from "thirdweb/wallets";
|
|
15
16
|
*
|
|
17
|
+
* const client = createThirdwebClient({
|
|
18
|
+
* clientId: "YOUR_CLIENT_ID",
|
|
19
|
+
* });
|
|
20
|
+
*
|
|
16
21
|
* function Example() {
|
|
17
22
|
* const { connect, isConnecting, error } = useConnect();
|
|
18
23
|
* return (
|
|
@@ -22,7 +27,9 @@ const useSetActiveWalletConnectionStatus_js_1 = require("./useSetActiveWalletCon
|
|
|
22
27
|
* // instantiate wallet
|
|
23
28
|
* const wallet = createWallet("io.metamask");
|
|
24
29
|
* // connect wallet
|
|
25
|
-
* await wallet.connect(
|
|
30
|
+
* await wallet.connect({
|
|
31
|
+
* client,
|
|
32
|
+
* });
|
|
26
33
|
* // return the wallet
|
|
27
34
|
* return wallet;
|
|
28
35
|
* })
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useConnect.js","sourceRoot":"","sources":["../../../../../../src/react/core/hooks/wallets/useConnect.ts"],"names":[],"mappings":";AAAA,YAAY,CAAC;;
|
|
1
|
+
{"version":3,"file":"useConnect.js","sourceRoot":"","sources":["../../../../../../src/react/core/hooks/wallets/useConnect.ts"],"names":[],"mappings":";AAAA,YAAY,CAAC;;AA6Cb,gCAqCC;AAhFD,iCAA8C;AAG9C,iFAAgF;AAChF,mGAA6F;AAE7F;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,SAAgB,UAAU,CAAC,OAA+B;IACxD,MAAM,OAAO,GAAG,IAAA,+CAAuB,EAAC,YAAY,CAAC,CAAC;IACtD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,mBAAmB,GAAG,IAAA,0EAAkC,GAAE,CAAC;IACjE,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IACxD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,EAAe,IAAI,CAAC,CAAC;IAEvD,MAAM,gBAAgB,GAAG,IAAA,mBAAW,EAClC,KAAK,EAAE,UAA4C,EAAE,EAAE;QACrD,oBAAoB;QACpB,QAAQ,CAAC,IAAI,CAAC,CAAC;QACf,mBAAmB,CAAC,YAAY,CAAC,CAAC;QAClC,IAAI,OAAO,UAAU,KAAK,UAAU,EAAE,CAAC;YACrC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YACnD,mBAAmB,CAAC,WAAW,CAAC,CAAC;YACjC,OAAO,OAAO,CAAC;QACjB,CAAC;QAED,eAAe,CAAC,IAAI,CAAC,CAAC;QACtB,IAAI,CAAC;YACH,MAAM,CAAC,GAAG,MAAM,UAAU,EAAE,CAAC;YAC7B,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;YAC1C,mBAAmB,CAAC,WAAW,CAAC,CAAC;YACjC,OAAO,OAAO,CAAC;QACjB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjB,QAAQ,CAAC,CAAU,CAAC,CAAC;YACrB,mBAAmB,CAAC,cAAc,CAAC,CAAC;QACtC,CAAC;gBAAS,CAAC;YACT,eAAe,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,EACD,CAAC,OAAO,EAAE,OAAO,EAAE,mBAAmB,CAAC,CACxC,CAAC;IAEF,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,KAAK,EAAW,CAAC;AACrE,CAAC"}
|
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"}
|
|
@@ -24,7 +24,7 @@ async function getUserStatus({ authToken, client, ecosystem, }) {
|
|
|
24
24
|
return undefined;
|
|
25
25
|
}
|
|
26
26
|
const result = await response.json();
|
|
27
|
-
throw new Error(`Failed to get user status: ${result.
|
|
27
|
+
throw new Error(`Failed to get user status: ${result.message}`);
|
|
28
28
|
}
|
|
29
29
|
return (await response.json());
|
|
30
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-enclave-user-status.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/actions/get-enclave-user-status.ts"],"names":[],"mappings":";;AAWA,sCAgCC;AA1CD,6DAAkE;AAClE,yDAA4D;AAI5D;;;;GAIG;AACI,KAAK,UAAU,aAAa,CAAC,EAClC,SAAS,EACT,MAAM,EACN,SAAS,GAKV;IACC,MAAM,WAAW,GAAG,IAAA,yBAAc,EAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,MAAM,WAAW,CAChC,GAAG,IAAA,+BAAkB,EAAC,aAAa,CAAC,0BAA0B,EAC9D;QACE,MAAM,EAAE,KAAK;QACb,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;YAClC,sBAAsB,EAAE,MAAM,CAAC,QAAQ;YACvC,aAAa,EAAE,gCAAgC,SAAS,EAAE;SAC3D;KACF,CACF,CAAC;IAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAC5B,4EAA4E;YAC5E,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CAAC,8BAA8B,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"get-enclave-user-status.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/actions/get-enclave-user-status.ts"],"names":[],"mappings":";;AAWA,sCAgCC;AA1CD,6DAAkE;AAClE,yDAA4D;AAI5D;;;;GAIG;AACI,KAAK,UAAU,aAAa,CAAC,EAClC,SAAS,EACT,MAAM,EACN,SAAS,GAKV;IACC,MAAM,WAAW,GAAG,IAAA,yBAAc,EAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,MAAM,WAAW,CAChC,GAAG,IAAA,+BAAkB,EAAC,aAAa,CAAC,0BAA0B,EAC9D;QACE,MAAM,EAAE,KAAK;QACb,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;YAClC,sBAAsB,EAAE,MAAM,CAAC,QAAQ;YACvC,aAAa,EAAE,gCAAgC,SAAS,EAAE;SAC3D;KACF,CACF,CAAC;IAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAC5B,4EAA4E;YAC5E,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CAAC,8BAA8B,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;IAClE,CAAC;IAED,OAAO,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAe,CAAC;AAC/C,CAAC"}
|
|
@@ -94,33 +94,40 @@ function createConnectionManager(storage) {
|
|
|
94
94
|
if (!account) {
|
|
95
95
|
throw new Error("Can not set a wallet without an account as active");
|
|
96
96
|
}
|
|
97
|
-
const
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
});
|
|
106
|
-
}
|
|
97
|
+
const activeWallet = await (async () => {
|
|
98
|
+
if (options?.accountAbstraction && !(0, isSmartWallet_js_1.hasSmartAccount)(wallet)) {
|
|
99
|
+
return await handleSmartWalletConnection(account, options.client, options.accountAbstraction);
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
return wallet;
|
|
103
|
+
}
|
|
104
|
+
})();
|
|
107
105
|
// add personal wallet to connected wallets list
|
|
108
|
-
addConnectedWallet(
|
|
109
|
-
if (
|
|
110
|
-
await storage.setItem(LAST_ACTIVE_EOA_ID,
|
|
106
|
+
addConnectedWallet(wallet);
|
|
107
|
+
if (wallet.id !== "smart") {
|
|
108
|
+
await storage.setItem(LAST_ACTIVE_EOA_ID, wallet.id);
|
|
111
109
|
}
|
|
110
|
+
handleSetActiveWallet(activeWallet);
|
|
111
|
+
wallet.subscribe("accountChanged", async () => {
|
|
112
|
+
// We reimplement connect here to prevent memory leaks
|
|
113
|
+
const newWallet = await handleConnection(wallet, options);
|
|
114
|
+
options?.onConnect?.(newWallet);
|
|
115
|
+
});
|
|
112
116
|
return activeWallet;
|
|
113
117
|
};
|
|
118
|
+
const handleSmartWalletConnection = async (signer, client, options) => {
|
|
119
|
+
const wallet = (0, smart_wallet_js_1.smartWallet)(options);
|
|
120
|
+
await wallet.connect({
|
|
121
|
+
personalAccount: signer,
|
|
122
|
+
client: client,
|
|
123
|
+
chain: options.chain,
|
|
124
|
+
});
|
|
125
|
+
return wallet;
|
|
126
|
+
};
|
|
114
127
|
const connect = async (wallet, options) => {
|
|
115
|
-
// connectedWallet can be either wallet or smartWallet
|
|
128
|
+
// connectedWallet can be either wallet or smartWallet
|
|
116
129
|
const connectedWallet = await handleConnection(wallet, options);
|
|
117
130
|
options?.onConnect?.(connectedWallet);
|
|
118
|
-
handleSetActiveWallet(connectedWallet);
|
|
119
|
-
wallet.subscribe("accountChanged", async () => {
|
|
120
|
-
const newConnectedWallet = await handleConnection(wallet, options);
|
|
121
|
-
options?.onConnect?.(newConnectedWallet);
|
|
122
|
-
handleSetActiveWallet(newConnectedWallet);
|
|
123
|
-
});
|
|
124
131
|
return connectedWallet;
|
|
125
132
|
};
|
|
126
133
|
const handleSetActiveWallet = (activeWallet) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/wallets/manager/index.ts"],"names":[],"mappings":";;AAuCA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/wallets/manager/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,6 +61,10 @@ Code: ${code}`);
|
|
|
61
61
|
paymasterAndData: res.result,
|
|
62
62
|
};
|
|
63
63
|
}
|
|
64
|
+
// check for policy errors
|
|
65
|
+
if (res.result.policyId && res.result.reason) {
|
|
66
|
+
console.warn(`Paymaster policy rejected this transaction with reason: ${res.result.reason} (policyId: ${res.result.policyId})`);
|
|
67
|
+
}
|
|
64
68
|
return {
|
|
65
69
|
paymasterAndData: res.result.paymasterAndData,
|
|
66
70
|
verificationGasLimit: res.result.verificationGasLimit
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paymaster.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/paymaster.ts"],"names":[],"mappings":";;AA+BA,
|
|
1
|
+
{"version":3,"file":"paymaster.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/paymaster.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,9 +7,14 @@ import { useSetActiveWalletConnectionStatus } from "./useSetActiveWalletConnecti
|
|
|
7
7
|
* @returns A function that lets you connect a wallet.
|
|
8
8
|
* @example
|
|
9
9
|
* ```jsx
|
|
10
|
+
* import { createThirdwebClient } from "thirdweb";
|
|
10
11
|
* import { useConnect } from "thirdweb/react";
|
|
11
12
|
* import { createWallet } from "thirdweb/wallets";
|
|
12
13
|
*
|
|
14
|
+
* const client = createThirdwebClient({
|
|
15
|
+
* clientId: "YOUR_CLIENT_ID",
|
|
16
|
+
* });
|
|
17
|
+
*
|
|
13
18
|
* function Example() {
|
|
14
19
|
* const { connect, isConnecting, error } = useConnect();
|
|
15
20
|
* return (
|
|
@@ -19,7 +24,9 @@ import { useSetActiveWalletConnectionStatus } from "./useSetActiveWalletConnecti
|
|
|
19
24
|
* // instantiate wallet
|
|
20
25
|
* const wallet = createWallet("io.metamask");
|
|
21
26
|
* // connect wallet
|
|
22
|
-
* await wallet.connect(
|
|
27
|
+
* await wallet.connect({
|
|
28
|
+
* client,
|
|
29
|
+
* });
|
|
23
30
|
* // return the wallet
|
|
24
31
|
* return wallet;
|
|
25
32
|
* })
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useConnect.js","sourceRoot":"","sources":["../../../../../../src/react/core/hooks/wallets/useConnect.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAG9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,EAAE,kCAAkC,EAAE,MAAM,yCAAyC,CAAC;AAE7F
|
|
1
|
+
{"version":3,"file":"useConnect.js","sourceRoot":"","sources":["../../../../../../src/react/core/hooks/wallets/useConnect.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAG9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,EAAE,kCAAkC,EAAE,MAAM,yCAAyC,CAAC;AAE7F;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,MAAM,UAAU,UAAU,CAAC,OAA+B;IACxD,MAAM,OAAO,GAAG,uBAAuB,CAAC,YAAY,CAAC,CAAC;IACtD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,mBAAmB,GAAG,kCAAkC,EAAE,CAAC;IACjE,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAe,IAAI,CAAC,CAAC;IAEvD,MAAM,gBAAgB,GAAG,WAAW,CAClC,KAAK,EAAE,UAA4C,EAAE,EAAE;QACrD,oBAAoB;QACpB,QAAQ,CAAC,IAAI,CAAC,CAAC;QACf,mBAAmB,CAAC,YAAY,CAAC,CAAC;QAClC,IAAI,OAAO,UAAU,KAAK,UAAU,EAAE,CAAC;YACrC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YACnD,mBAAmB,CAAC,WAAW,CAAC,CAAC;YACjC,OAAO,OAAO,CAAC;QACjB,CAAC;QAED,eAAe,CAAC,IAAI,CAAC,CAAC;QACtB,IAAI,CAAC;YACH,MAAM,CAAC,GAAG,MAAM,UAAU,EAAE,CAAC;YAC7B,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;YAC1C,mBAAmB,CAAC,WAAW,CAAC,CAAC;YACjC,OAAO,OAAO,CAAC;QACjB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjB,QAAQ,CAAC,CAAU,CAAC,CAAC;YACrB,mBAAmB,CAAC,cAAc,CAAC,CAAC;QACtC,CAAC;gBAAS,CAAC;YACT,eAAe,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,EACD,CAAC,OAAO,EAAE,OAAO,EAAE,mBAAmB,CAAC,CACxC,CAAC;IAEF,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,KAAK,EAAW,CAAC;AACrE,CAAC"}
|
package/dist/esm/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = "5.73.0
|
|
1
|
+
export const version = "5.73.0";
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
package/dist/esm/version.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAC"}
|
|
@@ -21,7 +21,7 @@ export async function getUserStatus({ authToken, client, ecosystem, }) {
|
|
|
21
21
|
return undefined;
|
|
22
22
|
}
|
|
23
23
|
const result = await response.json();
|
|
24
|
-
throw new Error(`Failed to get user status: ${result.
|
|
24
|
+
throw new Error(`Failed to get user status: ${result.message}`);
|
|
25
25
|
}
|
|
26
26
|
return (await response.json());
|
|
27
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-enclave-user-status.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/actions/get-enclave-user-status.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAI5D;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,EAClC,SAAS,EACT,MAAM,EACN,SAAS,GAKV;IACC,MAAM,WAAW,GAAG,cAAc,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,MAAM,WAAW,CAChC,GAAG,kBAAkB,CAAC,aAAa,CAAC,0BAA0B,EAC9D;QACE,MAAM,EAAE,KAAK;QACb,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;YAClC,sBAAsB,EAAE,MAAM,CAAC,QAAQ;YACvC,aAAa,EAAE,gCAAgC,SAAS,EAAE;SAC3D;KACF,CACF,CAAC;IAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAC5B,4EAA4E;YAC5E,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CAAC,8BAA8B,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"get-enclave-user-status.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/actions/get-enclave-user-status.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAI5D;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,EAClC,SAAS,EACT,MAAM,EACN,SAAS,GAKV;IACC,MAAM,WAAW,GAAG,cAAc,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,MAAM,WAAW,CAChC,GAAG,kBAAkB,CAAC,aAAa,CAAC,0BAA0B,EAC9D;QACE,MAAM,EAAE,KAAK;QACb,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;YAClC,sBAAsB,EAAE,MAAM,CAAC,QAAQ;YACvC,aAAa,EAAE,gCAAgC,SAAS,EAAE;SAC3D;KACF,CACF,CAAC;IAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAC5B,4EAA4E;YAC5E,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CAAC,8BAA8B,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;IAClE,CAAC;IAED,OAAO,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAe,CAAC;AAC/C,CAAC"}
|
|
@@ -88,33 +88,40 @@ export function createConnectionManager(storage) {
|
|
|
88
88
|
if (!account) {
|
|
89
89
|
throw new Error("Can not set a wallet without an account as active");
|
|
90
90
|
}
|
|
91
|
-
const
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
});
|
|
100
|
-
}
|
|
91
|
+
const activeWallet = await (async () => {
|
|
92
|
+
if (options?.accountAbstraction && !hasSmartAccount(wallet)) {
|
|
93
|
+
return await handleSmartWalletConnection(account, options.client, options.accountAbstraction);
|
|
94
|
+
}
|
|
95
|
+
else {
|
|
96
|
+
return wallet;
|
|
97
|
+
}
|
|
98
|
+
})();
|
|
101
99
|
// add personal wallet to connected wallets list
|
|
102
|
-
addConnectedWallet(
|
|
103
|
-
if (
|
|
104
|
-
await storage.setItem(LAST_ACTIVE_EOA_ID,
|
|
100
|
+
addConnectedWallet(wallet);
|
|
101
|
+
if (wallet.id !== "smart") {
|
|
102
|
+
await storage.setItem(LAST_ACTIVE_EOA_ID, wallet.id);
|
|
105
103
|
}
|
|
104
|
+
handleSetActiveWallet(activeWallet);
|
|
105
|
+
wallet.subscribe("accountChanged", async () => {
|
|
106
|
+
// We reimplement connect here to prevent memory leaks
|
|
107
|
+
const newWallet = await handleConnection(wallet, options);
|
|
108
|
+
options?.onConnect?.(newWallet);
|
|
109
|
+
});
|
|
106
110
|
return activeWallet;
|
|
107
111
|
};
|
|
112
|
+
const handleSmartWalletConnection = async (signer, client, options) => {
|
|
113
|
+
const wallet = smartWallet(options);
|
|
114
|
+
await wallet.connect({
|
|
115
|
+
personalAccount: signer,
|
|
116
|
+
client: client,
|
|
117
|
+
chain: options.chain,
|
|
118
|
+
});
|
|
119
|
+
return wallet;
|
|
120
|
+
};
|
|
108
121
|
const connect = async (wallet, options) => {
|
|
109
|
-
// connectedWallet can be either wallet or smartWallet
|
|
122
|
+
// connectedWallet can be either wallet or smartWallet
|
|
110
123
|
const connectedWallet = await handleConnection(wallet, options);
|
|
111
124
|
options?.onConnect?.(connectedWallet);
|
|
112
|
-
handleSetActiveWallet(connectedWallet);
|
|
113
|
-
wallet.subscribe("accountChanged", async () => {
|
|
114
|
-
const newConnectedWallet = await handleConnection(wallet, options);
|
|
115
|
-
options?.onConnect?.(newConnectedWallet);
|
|
116
|
-
handleSetActiveWallet(newConnectedWallet);
|
|
117
|
-
});
|
|
118
125
|
return connectedWallet;
|
|
119
126
|
};
|
|
120
127
|
const handleSetActiveWallet = (activeWallet) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/wallets/manager/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/wallets/manager/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,6 +58,10 @@ Code: ${code}`);
|
|
|
58
58
|
paymasterAndData: res.result,
|
|
59
59
|
};
|
|
60
60
|
}
|
|
61
|
+
// check for policy errors
|
|
62
|
+
if (res.result.policyId && res.result.reason) {
|
|
63
|
+
console.warn(`Paymaster policy rejected this transaction with reason: ${res.result.reason} (policyId: ${res.result.policyId})`);
|
|
64
|
+
}
|
|
61
65
|
return {
|
|
62
66
|
paymasterAndData: res.result.paymasterAndData,
|
|
63
67
|
verificationGasLimit: res.result.verificationGasLimit
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paymaster.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/paymaster.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"paymaster.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/paymaster.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,14 @@ import type { ConnectManagerOptions } from "../../../../wallets/manager/index.js
|
|
|
5
5
|
* @returns A function that lets you connect a wallet.
|
|
6
6
|
* @example
|
|
7
7
|
* ```jsx
|
|
8
|
+
* import { createThirdwebClient } from "thirdweb";
|
|
8
9
|
* import { useConnect } from "thirdweb/react";
|
|
9
10
|
* import { createWallet } from "thirdweb/wallets";
|
|
10
11
|
*
|
|
12
|
+
* const client = createThirdwebClient({
|
|
13
|
+
* clientId: "YOUR_CLIENT_ID",
|
|
14
|
+
* });
|
|
15
|
+
*
|
|
11
16
|
* function Example() {
|
|
12
17
|
* const { connect, isConnecting, error } = useConnect();
|
|
13
18
|
* return (
|
|
@@ -17,7 +22,9 @@ import type { ConnectManagerOptions } from "../../../../wallets/manager/index.js
|
|
|
17
22
|
* // instantiate wallet
|
|
18
23
|
* const wallet = createWallet("io.metamask");
|
|
19
24
|
* // connect wallet
|
|
20
|
-
* await wallet.connect(
|
|
25
|
+
* await wallet.connect({
|
|
26
|
+
* client,
|
|
27
|
+
* });
|
|
21
28
|
* // return the wallet
|
|
22
29
|
* return wallet;
|
|
23
30
|
* })
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useConnect.d.ts","sourceRoot":"","sources":["../../../../../../src/react/core/hooks/wallets/useConnect.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AACvE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAIlF
|
|
1
|
+
{"version":3,"file":"useConnect.d.ts","sourceRoot":"","sources":["../../../../../../src/react/core/hooks/wallets/useConnect.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AACvE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAIlF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,wBAAgB,UAAU,CAAC,OAAO,CAAC,EAAE,qBAAqB;mCAQnC,MAAM,GAAG,CAAC,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;;;EA6BtD"}
|
package/dist/types/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "5.73.0
|
|
1
|
+
export declare const version = "5.73.0";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,WAAW,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/wallets/manager/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAM7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAExE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAGnD,MAAM,MAAM,gBAAgB,GAAG,WAAW,GAAG,cAAc,GAAG,YAAY,CAAC;AAM3E,MAAM,MAAM,iBAAiB,GAAG,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAC3E,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,cAAc,CAAC;IACvB,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;CACtC,CAAC;AAEF;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,YAAY;;;;iCA6CvB,MAAM;+BA+BR,MAAM;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/wallets/manager/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAM7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAExE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAGnD,MAAM,MAAM,gBAAgB,GAAG,WAAW,GAAG,cAAc,GAAG,YAAY,CAAC;AAM3E,MAAM,MAAM,iBAAiB,GAAG,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAC3E,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,cAAc,CAAC;IACvB,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;CACtC,CAAC;AAEF;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,YAAY;;;;iCA6CvB,MAAM;+BA+BR,MAAM;oCA6GK,MAAM;sBAhDpB,MAAM,YAAY,qBAAqB;+BAtD5D,MAAM,YACJ,qBAAqB;;;;qCAwIa,KAAK;;;oCArKZ,MAAM;2BAqMf,KAAK,EAAE;EAqCtC;AAED;;;GAGG;AACH,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAU1B;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAW1B;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,CAWvB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paymaster.d.ts","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/paymaster.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAIhE,OAAO,KAAK,EACV,eAAe,EACf,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAIrB;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE;IAC9C,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,CAAC;IAC5C,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,EAAE,KAAK,CAAC;IACb,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,CAClB,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,KACxC,OAAO,CAAC,eAAe,CAAC,CAAC;CAC/B,GAAG,OAAO,CAAC,eAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"paymaster.d.ts","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/paymaster.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAIhE,OAAO,KAAK,EACV,eAAe,EACf,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAIrB;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE;IAC9C,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,CAAC;IAC5C,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,EAAE,KAAK,CAAC;IACb,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,CAClB,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,KACxC,OAAO,CAAC,eAAe,CAAC,CAAC;CAC/B,GAAG,OAAO,CAAC,eAAe,CAAC,CA6E3B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "thirdweb",
|
|
3
|
-
"version": "5.73.0
|
|
3
|
+
"version": "5.73.0",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "git+https://github.com/thirdweb-dev/js.git#main"
|
|
@@ -229,10 +229,11 @@
|
|
|
229
229
|
"@react-native-async-storage/async-storage": "^1 || ^2",
|
|
230
230
|
"ethers": "^5 || ^6",
|
|
231
231
|
"expo-linking": "^6",
|
|
232
|
-
"expo-web-browser": "^13",
|
|
232
|
+
"expo-web-browser": "^13 || ^14",
|
|
233
233
|
"react": ">=18",
|
|
234
234
|
"react-native": "*",
|
|
235
235
|
"react-native-aes-gcm-crypto": "^0.2",
|
|
236
|
+
"react-native-passkey": "^3",
|
|
236
237
|
"react-native-quick-crypto": ">=0.7.0-rc.6 || >=0.7",
|
|
237
238
|
"react-native-svg": "^15",
|
|
238
239
|
"typescript": ">=5.0.4"
|
|
@@ -322,7 +323,7 @@
|
|
|
322
323
|
"ethers5": "npm:ethers@5",
|
|
323
324
|
"ethers6": "npm:ethers@6",
|
|
324
325
|
"expo-linking": "7.0.3",
|
|
325
|
-
"expo-web-browser": "
|
|
326
|
+
"expo-web-browser": "14.0.1",
|
|
326
327
|
"happy-dom": "15.11.7",
|
|
327
328
|
"knip": "5.39.0",
|
|
328
329
|
"msw": "2.6.6",
|
|
@@ -11,9 +11,14 @@ import { useSetActiveWalletConnectionStatus } from "./useSetActiveWalletConnecti
|
|
|
11
11
|
* @returns A function that lets you connect a wallet.
|
|
12
12
|
* @example
|
|
13
13
|
* ```jsx
|
|
14
|
+
* import { createThirdwebClient } from "thirdweb";
|
|
14
15
|
* import { useConnect } from "thirdweb/react";
|
|
15
16
|
* import { createWallet } from "thirdweb/wallets";
|
|
16
17
|
*
|
|
18
|
+
* const client = createThirdwebClient({
|
|
19
|
+
* clientId: "YOUR_CLIENT_ID",
|
|
20
|
+
* });
|
|
21
|
+
*
|
|
17
22
|
* function Example() {
|
|
18
23
|
* const { connect, isConnecting, error } = useConnect();
|
|
19
24
|
* return (
|
|
@@ -23,7 +28,9 @@ import { useSetActiveWalletConnectionStatus } from "./useSetActiveWalletConnecti
|
|
|
23
28
|
* // instantiate wallet
|
|
24
29
|
* const wallet = createWallet("io.metamask");
|
|
25
30
|
* // connect wallet
|
|
26
|
-
* await wallet.connect(
|
|
31
|
+
* await wallet.connect({
|
|
32
|
+
* client,
|
|
33
|
+
* });
|
|
27
34
|
* // return the wallet
|
|
28
35
|
* return wallet;
|
|
29
36
|
* })
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = "5.73.0
|
|
1
|
+
export const version = "5.73.0";
|
|
@@ -37,7 +37,7 @@ export async function getUserStatus({
|
|
|
37
37
|
return undefined;
|
|
38
38
|
}
|
|
39
39
|
const result = await response.json();
|
|
40
|
-
throw new Error(`Failed to get user status: ${result.
|
|
40
|
+
throw new Error(`Failed to get user status: ${result.message}`);
|
|
41
41
|
}
|
|
42
42
|
|
|
43
43
|
return (await response.json()) as UserStatus;
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
2
|
+
import { TEST_CLIENT } from "../../../test/src/test-clients.js";
|
|
3
|
+
import { TEST_ACCOUNT_A } from "../../../test/src/test-wallets.js";
|
|
4
|
+
import { sepolia } from "../../chains/chain-definitions/sepolia.js";
|
|
5
|
+
import type { ThirdwebClient } from "../../client/client.js";
|
|
6
|
+
import type { AsyncStorage } from "../../utils/storage/AsyncStorage.js";
|
|
7
|
+
import type { Account, Wallet } from "../interfaces/wallet.js";
|
|
8
|
+
import type { SmartWalletOptions } from "../smart/types.js";
|
|
9
|
+
import { createConnectionManager } from "./index.js";
|
|
10
|
+
|
|
11
|
+
describe.runIf(process.env.TW_SECRET_KEY)("Connection Manager", () => {
|
|
12
|
+
let storage: AsyncStorage;
|
|
13
|
+
let client: ThirdwebClient;
|
|
14
|
+
let wallet: Wallet;
|
|
15
|
+
let account: Account;
|
|
16
|
+
let smartWalletOptions: SmartWalletOptions;
|
|
17
|
+
|
|
18
|
+
beforeEach(() => {
|
|
19
|
+
storage = {
|
|
20
|
+
getItem: vi.fn(),
|
|
21
|
+
setItem: vi.fn(),
|
|
22
|
+
removeItem: vi.fn(),
|
|
23
|
+
};
|
|
24
|
+
client = TEST_CLIENT;
|
|
25
|
+
account = TEST_ACCOUNT_A;
|
|
26
|
+
wallet = {
|
|
27
|
+
id: "wallet-id",
|
|
28
|
+
getAccount: vi.fn().mockReturnValue(account),
|
|
29
|
+
subscribe: vi.fn(),
|
|
30
|
+
disconnect: vi.fn(),
|
|
31
|
+
switchChain: vi.fn(),
|
|
32
|
+
getChain: vi.fn().mockReturnValue(sepolia),
|
|
33
|
+
getConfig: vi.fn(),
|
|
34
|
+
} as unknown as Wallet;
|
|
35
|
+
smartWalletOptions = {
|
|
36
|
+
chain: sepolia,
|
|
37
|
+
} as SmartWalletOptions;
|
|
38
|
+
});
|
|
39
|
+
|
|
40
|
+
it("connect should handle connection and call onConnect", async () => {
|
|
41
|
+
const manager = createConnectionManager(storage);
|
|
42
|
+
const onConnect = vi.fn();
|
|
43
|
+
|
|
44
|
+
await manager.connect(wallet, { client, onConnect });
|
|
45
|
+
|
|
46
|
+
expect(onConnect).toHaveBeenCalledWith(wallet);
|
|
47
|
+
expect(storage.setItem).toHaveBeenCalledWith(expect.any(String), wallet.id);
|
|
48
|
+
});
|
|
49
|
+
|
|
50
|
+
it("handleConnection should connect smart wallet", async () => {
|
|
51
|
+
const manager = createConnectionManager(storage);
|
|
52
|
+
|
|
53
|
+
const smartWallet = await manager.handleConnection(wallet, {
|
|
54
|
+
client,
|
|
55
|
+
accountAbstraction: smartWalletOptions,
|
|
56
|
+
});
|
|
57
|
+
|
|
58
|
+
expect(manager.activeWalletStore.getValue()).toBe(smartWallet);
|
|
59
|
+
});
|
|
60
|
+
|
|
61
|
+
it("handleConnection should add wallet to connected wallets", async () => {
|
|
62
|
+
const manager = createConnectionManager(storage);
|
|
63
|
+
|
|
64
|
+
await manager.handleConnection(wallet, { client });
|
|
65
|
+
|
|
66
|
+
expect(manager.connectedWallets.getValue()).toContain(wallet);
|
|
67
|
+
});
|
|
68
|
+
});
|
|
@@ -128,37 +128,56 @@ export function createConnectionManager(storage: AsyncStorage) {
|
|
|
128
128
|
throw new Error("Can not set a wallet without an account as active");
|
|
129
129
|
}
|
|
130
130
|
|
|
131
|
-
const
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
131
|
+
const activeWallet = await (async () => {
|
|
132
|
+
if (options?.accountAbstraction && !hasSmartAccount(wallet)) {
|
|
133
|
+
return await handleSmartWalletConnection(
|
|
134
|
+
account,
|
|
135
|
+
options.client,
|
|
136
|
+
options.accountAbstraction,
|
|
137
|
+
);
|
|
138
|
+
} else {
|
|
139
|
+
return wallet;
|
|
140
|
+
}
|
|
141
|
+
})();
|
|
141
142
|
|
|
142
143
|
// add personal wallet to connected wallets list
|
|
143
|
-
addConnectedWallet(
|
|
144
|
+
addConnectedWallet(wallet);
|
|
144
145
|
|
|
145
|
-
if (
|
|
146
|
-
await storage.setItem(LAST_ACTIVE_EOA_ID,
|
|
146
|
+
if (wallet.id !== "smart") {
|
|
147
|
+
await storage.setItem(LAST_ACTIVE_EOA_ID, wallet.id);
|
|
147
148
|
}
|
|
148
149
|
|
|
150
|
+
handleSetActiveWallet(activeWallet);
|
|
151
|
+
|
|
152
|
+
wallet.subscribe("accountChanged", async () => {
|
|
153
|
+
// We reimplement connect here to prevent memory leaks
|
|
154
|
+
const newWallet = await handleConnection(wallet, options);
|
|
155
|
+
options?.onConnect?.(newWallet);
|
|
156
|
+
});
|
|
157
|
+
|
|
149
158
|
return activeWallet;
|
|
150
159
|
};
|
|
151
160
|
|
|
161
|
+
const handleSmartWalletConnection = async (
|
|
162
|
+
signer: Account,
|
|
163
|
+
client: ThirdwebClient,
|
|
164
|
+
options: SmartWalletOptions,
|
|
165
|
+
) => {
|
|
166
|
+
const wallet = smartWallet(options);
|
|
167
|
+
|
|
168
|
+
await wallet.connect({
|
|
169
|
+
personalAccount: signer,
|
|
170
|
+
client: client,
|
|
171
|
+
chain: options.chain,
|
|
172
|
+
});
|
|
173
|
+
|
|
174
|
+
return wallet;
|
|
175
|
+
};
|
|
176
|
+
|
|
152
177
|
const connect = async (wallet: Wallet, options?: ConnectManagerOptions) => {
|
|
153
|
-
// connectedWallet can be either wallet or smartWallet
|
|
178
|
+
// connectedWallet can be either wallet or smartWallet
|
|
154
179
|
const connectedWallet = await handleConnection(wallet, options);
|
|
155
180
|
options?.onConnect?.(connectedWallet);
|
|
156
|
-
handleSetActiveWallet(connectedWallet);
|
|
157
|
-
wallet.subscribe("accountChanged", async () => {
|
|
158
|
-
const newConnectedWallet = await handleConnection(wallet, options);
|
|
159
|
-
options?.onConnect?.(newConnectedWallet);
|
|
160
|
-
handleSetActiveWallet(newConnectedWallet);
|
|
161
|
-
});
|
|
162
181
|
return connectedWallet;
|
|
163
182
|
};
|
|
164
183
|
|
|
@@ -83,6 +83,13 @@ Code: ${code}`,
|
|
|
83
83
|
paymasterAndData: res.result,
|
|
84
84
|
};
|
|
85
85
|
}
|
|
86
|
+
// check for policy errors
|
|
87
|
+
if (res.result.policyId && res.result.reason) {
|
|
88
|
+
console.warn(
|
|
89
|
+
`Paymaster policy rejected this transaction with reason: ${res.result.reason} (policyId: ${res.result.policyId})`,
|
|
90
|
+
);
|
|
91
|
+
}
|
|
92
|
+
|
|
86
93
|
return {
|
|
87
94
|
paymasterAndData: res.result.paymasterAndData,
|
|
88
95
|
verificationGasLimit: res.result.verificationGasLimit
|