thirdweb 5.102.4-nightly-3d1c321bd6f5783bdee43185deef88f91b325a23-20250604000438 → 5.102.5
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/utils/bytecode/resolveImplementation.js +4 -1
- package/dist/cjs/utils/bytecode/resolveImplementation.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/cjs/version.js.map +1 -1
- package/dist/cjs/wallets/ecosystem/get-ecosystem-wallet-auth-options.js.map +1 -1
- package/dist/cjs/wallets/in-app/core/wallet/in-app-core.js +42 -55
- package/dist/cjs/wallets/in-app/core/wallet/in-app-core.js.map +1 -1
- package/dist/esm/utils/bytecode/resolveImplementation.js +4 -1
- package/dist/esm/utils/bytecode/resolveImplementation.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/esm/version.js.map +1 -1
- package/dist/esm/wallets/ecosystem/get-ecosystem-wallet-auth-options.js.map +1 -1
- package/dist/esm/wallets/in-app/core/wallet/in-app-core.js +42 -55
- package/dist/esm/wallets/in-app/core/wallet/in-app-core.js.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/dist/types/version.d.ts.map +1 -1
- package/dist/types/wallets/ecosystem/get-ecosystem-wallet-auth-options.d.ts +2 -1
- package/dist/types/wallets/ecosystem/get-ecosystem-wallet-auth-options.d.ts.map +1 -1
- package/dist/types/wallets/in-app/core/wallet/in-app-core.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/utils/bytecode/handleBeaconProxyPattern.test.ts +52 -0
- package/src/utils/bytecode/resolveImplementation.ts +4 -1
- package/src/version.ts +1 -1
- package/src/wallets/ecosystem/get-ecosystem-wallet-auth-options.ts +2 -1
- package/src/wallets/in-app/core/wallet/in-app-core.ts +50 -63
|
@@ -94,7 +94,10 @@ contract) {
|
|
|
94
94
|
address: contract.address,
|
|
95
95
|
position: "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
|
|
96
96
|
});
|
|
97
|
-
|
|
97
|
+
if (proxyStorage.length >= 40) {
|
|
98
|
+
return `0x${proxyStorage.slice(-40)}`;
|
|
99
|
+
}
|
|
100
|
+
return undefined;
|
|
98
101
|
}
|
|
99
102
|
catch {
|
|
100
103
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveImplementation.js","sourceRoot":"","sources":["../../../../src/utils/bytecode/resolveImplementation.ts"],"names":[],"mappings":";;AAyBA,sDAgEC;AAzFD,4EAAqE;AACrE,4DAAgF;AAChF,+EAAyE;AACzE,6CAAgD;AAChD,yEAAkE;AAClE,8CAA0C;AAE1C,+GAAyG;AAEzG,8BAA8B;AAC9B,MAAM,WAAW,GAAG,4CAA4C,CAAC;AACjE,MAAM,YAAY,GAChB,oEAAoE,CAAC;AAEvE;;;;;;;;;;GAUG;AACI,KAAK,UAAU,qBAAqB;AACzC,4DAA4D;AAC5D,QAA+B;IAE/B,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACnD,IAAA,6BAAW,EAAC,QAAQ,CAAC;QACrB,wBAAwB,CAAC,QAAQ,CAAC;KACnC,CAAC,CAAC;IACH,0CAA0C;IAC1C,MAAM,iCAAiC,GACrC,IAAA,sFAAwC,EAAC,gBAAgB,CAAC,CAAC;IAC7D,IAAI,iCAAiC,EAAE,CAAC;QACtC,OAAO;YACL,OAAO,EAAE,iCAAiC;YAC1C,QAAQ,EAAE,MAAM,IAAA,6BAAW,EACzB,IAAA,yBAAW,EAAC;gBACV,GAAG,QAAQ;gBACX,OAAO,EAAE,iCAAiC;aAC3C,CAAC,CACH;SACF,CAAC;IACJ,CAAC;IAED,0BAA0B;IAC1B,IAAI,qBAAyC,CAAC;IAE9C,IAAI,MAAM,IAAI,MAAM,KAAK,WAAW,EAAE,CAAC;QACrC,qFAAqF;QACrF,+FAA+F;QAC/F,6FAA6F;QAC7F,QAAQ,GAAG,IAAA,yBAAW,EAAC;YACrB,GAAG,QAAQ;YACX,OAAO,EAAE,MAAM;SAChB,CAAC,CAAC;QAEH,qBAAqB,GAAG,MAAM,iCAAiC,CAAC,QAAQ,CAAC,CAAC;IAC5E,CAAC;SAAM,CAAC;QACN,qBAAqB,GAAG,MAAM,gCAAgC,CAAC,QAAQ,CAAC,CAAC;IAC3E,CAAC;IAED,IACE,qBAAqB;QACrB,IAAA,sBAAS,EAAC,qBAAqB,CAAC;QAChC,qBAAqB,KAAK,WAAW,EACrC,CAAC;QACD,MAAM,sBAAsB,GAAG,MAAM,IAAA,6BAAW,EAAC;YAC/C,GAAG,QAAQ;YACX,OAAO,EAAE,qBAAqB;SAC/B,CAAC,CAAC;QACH,gFAAgF;QAChF,IAAI,sBAAsB,KAAK,IAAI,EAAE,CAAC;YACpC,OAAO;gBACL,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,QAAQ,EAAE,gBAAgB;aAC3B,CAAC;QACJ,CAAC;QAED,OAAO;YACL,OAAO,EAAE,qBAAqB;YAC9B,QAAQ,EAAE,sBAAsB;SACjC,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC;AACnE,CAAC;AAED,KAAK,UAAU,wBAAwB;AACrC,4DAA4D;AAC5D,QAA+B;IAE/B;;;;;OAKG;IACH,MAAM,UAAU,GAAG,IAAA,qBAAY,EAAC;QAC9B,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,KAAK,EAAE,QAAQ,CAAC,KAAK;KACtB,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,IAAA,sCAAgB,EAAC,UAAU,EAAE;YACtD,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,QAAQ,EACN,oEAAoE;SACvE,CAAC,CAAC;QACH,OAAO,KAAK,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"resolveImplementation.js","sourceRoot":"","sources":["../../../../src/utils/bytecode/resolveImplementation.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/version.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.version = void 0;
|
|
4
|
-
exports.version = "5.102.
|
|
4
|
+
exports.version = "5.102.5";
|
|
5
5
|
//# sourceMappingURL=version.js.map
|
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,SAAS,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-ecosystem-wallet-auth-options.js","sourceRoot":"","sources":["../../../../src/wallets/ecosystem/get-ecosystem-wallet-auth-options.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"get-ecosystem-wallet-auth-options.js","sourceRoot":"","sources":["../../../../src/wallets/ecosystem/get-ecosystem-wallet-auth-options.ts"],"names":[],"mappings":";;AA2BA,4CAoCC;AA/DD,uDAA4D;AAC5D,mEAA6D;AAoB7D;;;;;GAKG;AACI,KAAK,UAAU,gBAAgB,CACpC,QAA2B;IAE3B,OAAO,IAAA,wBAAS,EACd,KAAK,IAAI,EAAE;QACT,MAAM,GAAG,GAAG,MAAM,KAAK,CACrB,GAAG,IAAA,+BAAkB,EAAC,aAAa,CAAC,kCAAkC,EACtE;YACE,OAAO,EAAE;gBACP,gBAAgB,EAAE,QAAQ;aAC3B;SACF,CACF,CAAC;QAEF,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAE9B,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CACb,IAAI,CAAC,OAAO;gBACV,2CAA2C,QAAQ,qDAAqD,CAC3G,CAAC;QACJ,CAAC;QAED,uGAAuG;QACvG,IAAI,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC;YACxE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,EACD;QACE,QAAQ,EAAE,4BAA4B,QAAQ,EAAE;QAChD,SAAS,EAAE,IAAI,GAAG,EAAE,GAAG,CAAC,EAAE,SAAS;KACpC,CACF,CAAC;AACJ,CAAC"}
|
|
@@ -37,26 +37,23 @@ function createInAppWallet(args) {
|
|
|
37
37
|
let chain = undefined;
|
|
38
38
|
let client;
|
|
39
39
|
let authToken = null;
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
const ecosystemOptions = await (0, get_ecosystem_wallet_auth_options_js_1.getEcosystemInfo)(ecosystem.id);
|
|
58
|
-
const smartAccountOptions = ecosystemOptions?.smartAccountOptions;
|
|
59
|
-
if (smartAccountOptions) {
|
|
40
|
+
const resolveSmartAccountOptionsFromEcosystem = async (options) => {
|
|
41
|
+
if (ecosystem) {
|
|
42
|
+
const ecosystemOptions = await (0, get_ecosystem_wallet_auth_options_js_1.getEcosystemInfo)(ecosystem.id);
|
|
43
|
+
const smartAccountOptions = ecosystemOptions?.smartAccountOptions;
|
|
44
|
+
if (smartAccountOptions) {
|
|
45
|
+
const executionMode = ecosystemOptions.smartAccountOptions.executionMode;
|
|
46
|
+
if (executionMode === "EIP7702") {
|
|
47
|
+
createOptions = {
|
|
48
|
+
...createOptions,
|
|
49
|
+
executionMode: {
|
|
50
|
+
mode: "EIP7702",
|
|
51
|
+
sponsorGas: smartAccountOptions.sponsorGas,
|
|
52
|
+
},
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
// default to 4337
|
|
60
57
|
const { defaultChainId } = ecosystemOptions.smartAccountOptions;
|
|
61
58
|
const preferredChain = options.chain ??
|
|
62
59
|
(defaultChainId ? (0, utils_js_1.getCachedChain)(defaultChainId) : undefined);
|
|
@@ -73,6 +70,25 @@ function createInAppWallet(args) {
|
|
|
73
70
|
};
|
|
74
71
|
}
|
|
75
72
|
}
|
|
73
|
+
}
|
|
74
|
+
};
|
|
75
|
+
return {
|
|
76
|
+
id: walletId,
|
|
77
|
+
getAuthToken: () => authToken,
|
|
78
|
+
subscribe: emitter.subscribe,
|
|
79
|
+
getChain() {
|
|
80
|
+
if (!chain) {
|
|
81
|
+
return undefined;
|
|
82
|
+
}
|
|
83
|
+
chain = (0, utils_js_1.getCachedChainIfExists)(chain.id) || chain;
|
|
84
|
+
return chain;
|
|
85
|
+
},
|
|
86
|
+
getConfig: () => createOptions,
|
|
87
|
+
getAccount: () => account,
|
|
88
|
+
autoConnect: async (options) => {
|
|
89
|
+
const { autoConnectInAppWallet } = await Promise.resolve().then(() => require("./index.js"));
|
|
90
|
+
const connector = await getOrCreateInAppWalletConnector(options.client, connectorFactory, ecosystem);
|
|
91
|
+
await resolveSmartAccountOptionsFromEcosystem(options);
|
|
76
92
|
const { account: connectedAccount, chain: connectedChain, adminAccount: _adminAccount, } = await autoConnectInAppWallet(options, createOptions, connector);
|
|
77
93
|
// set the states
|
|
78
94
|
client = options.client;
|
|
@@ -99,26 +115,7 @@ function createInAppWallet(args) {
|
|
|
99
115
|
connect: async (options) => {
|
|
100
116
|
const { connectInAppWallet } = await Promise.resolve().then(() => require("./index.js"));
|
|
101
117
|
const connector = await getOrCreateInAppWalletConnector(options.client, connectorFactory, ecosystem);
|
|
102
|
-
|
|
103
|
-
const ecosystemOptions = await (0, get_ecosystem_wallet_auth_options_js_1.getEcosystemInfo)(ecosystem.id);
|
|
104
|
-
const smartAccountOptions = ecosystemOptions?.smartAccountOptions;
|
|
105
|
-
if (smartAccountOptions) {
|
|
106
|
-
const { defaultChainId } = ecosystemOptions.smartAccountOptions;
|
|
107
|
-
const preferredChain = options.chain ??
|
|
108
|
-
(defaultChainId ? (0, utils_js_1.getCachedChain)(defaultChainId) : undefined);
|
|
109
|
-
if (!preferredChain) {
|
|
110
|
-
throw new Error(`A chain must be provided either via 'chain' in connect options or 'defaultChainId' in ecosystem configuration. Please pass it via connect() or update the ecosystem configuration.`);
|
|
111
|
-
}
|
|
112
|
-
createOptions = {
|
|
113
|
-
...createOptions,
|
|
114
|
-
smartAccount: {
|
|
115
|
-
chain: preferredChain,
|
|
116
|
-
sponsorGas: smartAccountOptions.sponsorGas,
|
|
117
|
-
factoryAddress: smartAccountOptions.accountFactoryAddress,
|
|
118
|
-
},
|
|
119
|
-
};
|
|
120
|
-
}
|
|
121
|
-
}
|
|
118
|
+
await resolveSmartAccountOptionsFromEcosystem(options);
|
|
122
119
|
const { account: connectedAccount, chain: connectedChain, adminAccount: _adminAccount, } = await connectInAppWallet(options, createOptions, connector);
|
|
123
120
|
// set the states
|
|
124
121
|
client = options.client;
|
|
@@ -158,24 +155,14 @@ function createInAppWallet(args) {
|
|
|
158
155
|
emitter.emit("disconnect", undefined);
|
|
159
156
|
},
|
|
160
157
|
switchChain: async (newChain) => {
|
|
161
|
-
if (createOptions?.smartAccount
|
|
158
|
+
if ((createOptions?.smartAccount ||
|
|
159
|
+
createOptions?.executionMode?.mode === "EIP4337") &&
|
|
160
|
+
client &&
|
|
161
|
+
account) {
|
|
162
162
|
// if account abstraction is enabled, reconnect to smart account on the new chain
|
|
163
163
|
const { autoConnectInAppWallet } = await Promise.resolve().then(() => require("./index.js"));
|
|
164
164
|
const connector = await getOrCreateInAppWalletConnector(client, connectorFactory, ecosystem);
|
|
165
|
-
|
|
166
|
-
const ecosystemOptions = await (0, get_ecosystem_wallet_auth_options_js_1.getEcosystemInfo)(ecosystem.id);
|
|
167
|
-
const smartAccountOptions = ecosystemOptions?.smartAccountOptions;
|
|
168
|
-
if (smartAccountOptions) {
|
|
169
|
-
createOptions = {
|
|
170
|
-
...createOptions,
|
|
171
|
-
smartAccount: {
|
|
172
|
-
chain: newChain,
|
|
173
|
-
sponsorGas: smartAccountOptions.sponsorGas,
|
|
174
|
-
factoryAddress: smartAccountOptions.accountFactoryAddress,
|
|
175
|
-
},
|
|
176
|
-
};
|
|
177
|
-
}
|
|
178
|
-
}
|
|
165
|
+
await resolveSmartAccountOptionsFromEcosystem({ chain: newChain });
|
|
179
166
|
const { account: connectedAccount, chain: connectedChain, adminAccount: _adminAccount, } = await autoConnectInAppWallet({
|
|
180
167
|
chain: newChain,
|
|
181
168
|
client,
|
|
@@ -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,0EAgBC;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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"}
|
|
@@ -91,7 +91,10 @@ contract) {
|
|
|
91
91
|
address: contract.address,
|
|
92
92
|
position: "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
|
|
93
93
|
});
|
|
94
|
-
|
|
94
|
+
if (proxyStorage.length >= 40) {
|
|
95
|
+
return `0x${proxyStorage.slice(-40)}`;
|
|
96
|
+
}
|
|
97
|
+
return undefined;
|
|
95
98
|
}
|
|
96
99
|
catch {
|
|
97
100
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveImplementation.js","sourceRoot":"","sources":["../../../../src/utils/bytecode/resolveImplementation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAyB,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,wCAAwC,EAAE,MAAM,+CAA+C,CAAC;AAEzG,8BAA8B;AAC9B,MAAM,WAAW,GAAG,4CAA4C,CAAC;AACjE,MAAM,YAAY,GAChB,oEAAoE,CAAC;AAEvE;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB;AACzC,4DAA4D;AAC5D,QAA+B;IAE/B,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACnD,WAAW,CAAC,QAAQ,CAAC;QACrB,wBAAwB,CAAC,QAAQ,CAAC;KACnC,CAAC,CAAC;IACH,0CAA0C;IAC1C,MAAM,iCAAiC,GACrC,wCAAwC,CAAC,gBAAgB,CAAC,CAAC;IAC7D,IAAI,iCAAiC,EAAE,CAAC;QACtC,OAAO;YACL,OAAO,EAAE,iCAAiC;YAC1C,QAAQ,EAAE,MAAM,WAAW,CACzB,WAAW,CAAC;gBACV,GAAG,QAAQ;gBACX,OAAO,EAAE,iCAAiC;aAC3C,CAAC,CACH;SACF,CAAC;IACJ,CAAC;IAED,0BAA0B;IAC1B,IAAI,qBAAyC,CAAC;IAE9C,IAAI,MAAM,IAAI,MAAM,KAAK,WAAW,EAAE,CAAC;QACrC,qFAAqF;QACrF,+FAA+F;QAC/F,6FAA6F;QAC7F,QAAQ,GAAG,WAAW,CAAC;YACrB,GAAG,QAAQ;YACX,OAAO,EAAE,MAAM;SAChB,CAAC,CAAC;QAEH,qBAAqB,GAAG,MAAM,iCAAiC,CAAC,QAAQ,CAAC,CAAC;IAC5E,CAAC;SAAM,CAAC;QACN,qBAAqB,GAAG,MAAM,gCAAgC,CAAC,QAAQ,CAAC,CAAC;IAC3E,CAAC;IAED,IACE,qBAAqB;QACrB,SAAS,CAAC,qBAAqB,CAAC;QAChC,qBAAqB,KAAK,WAAW,EACrC,CAAC;QACD,MAAM,sBAAsB,GAAG,MAAM,WAAW,CAAC;YAC/C,GAAG,QAAQ;YACX,OAAO,EAAE,qBAAqB;SAC/B,CAAC,CAAC;QACH,gFAAgF;QAChF,IAAI,sBAAsB,KAAK,IAAI,EAAE,CAAC;YACpC,OAAO;gBACL,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,QAAQ,EAAE,gBAAgB;aAC3B,CAAC;QACJ,CAAC;QAED,OAAO;YACL,OAAO,EAAE,qBAAqB;YAC9B,QAAQ,EAAE,sBAAsB;SACjC,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC;AACnE,CAAC;AAED,KAAK,UAAU,wBAAwB;AACrC,4DAA4D;AAC5D,QAA+B;IAE/B;;;;;OAKG;IACH,MAAM,UAAU,GAAG,YAAY,CAAC;QAC9B,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,KAAK,EAAE,QAAQ,CAAC,KAAK;KACtB,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,UAAU,EAAE;YACtD,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,QAAQ,EACN,oEAAoE;SACvE,CAAC,CAAC;QACH,OAAO,KAAK,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"resolveImplementation.js","sourceRoot":"","sources":["../../../../src/utils/bytecode/resolveImplementation.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = "5.102.
|
|
1
|
+
export const version = "5.102.5";
|
|
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,SAAS,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-ecosystem-wallet-auth-options.js","sourceRoot":"","sources":["../../../../src/wallets/ecosystem/get-ecosystem-wallet-auth-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"get-ecosystem-wallet-auth-options.js","sourceRoot":"","sources":["../../../../src/wallets/ecosystem/get-ecosystem-wallet-auth-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAoB7D;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,QAA2B;IAE3B,OAAO,SAAS,CACd,KAAK,IAAI,EAAE;QACT,MAAM,GAAG,GAAG,MAAM,KAAK,CACrB,GAAG,kBAAkB,CAAC,aAAa,CAAC,kCAAkC,EACtE;YACE,OAAO,EAAE;gBACP,gBAAgB,EAAE,QAAQ;aAC3B;SACF,CACF,CAAC;QAEF,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAE9B,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CACb,IAAI,CAAC,OAAO;gBACV,2CAA2C,QAAQ,qDAAqD,CAC3G,CAAC;QACJ,CAAC;QAED,uGAAuG;QACvG,IAAI,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC;YACxE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,EACD;QACE,QAAQ,EAAE,4BAA4B,QAAQ,EAAE;QAChD,SAAS,EAAE,IAAI,GAAG,EAAE,GAAG,CAAC,EAAE,SAAS;KACpC,CACF,CAAC;AACJ,CAAC"}
|
|
@@ -33,26 +33,23 @@ export function createInAppWallet(args) {
|
|
|
33
33
|
let chain = undefined;
|
|
34
34
|
let client;
|
|
35
35
|
let authToken = null;
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
const ecosystemOptions = await getEcosystemInfo(ecosystem.id);
|
|
54
|
-
const smartAccountOptions = ecosystemOptions?.smartAccountOptions;
|
|
55
|
-
if (smartAccountOptions) {
|
|
36
|
+
const resolveSmartAccountOptionsFromEcosystem = async (options) => {
|
|
37
|
+
if (ecosystem) {
|
|
38
|
+
const ecosystemOptions = await getEcosystemInfo(ecosystem.id);
|
|
39
|
+
const smartAccountOptions = ecosystemOptions?.smartAccountOptions;
|
|
40
|
+
if (smartAccountOptions) {
|
|
41
|
+
const executionMode = ecosystemOptions.smartAccountOptions.executionMode;
|
|
42
|
+
if (executionMode === "EIP7702") {
|
|
43
|
+
createOptions = {
|
|
44
|
+
...createOptions,
|
|
45
|
+
executionMode: {
|
|
46
|
+
mode: "EIP7702",
|
|
47
|
+
sponsorGas: smartAccountOptions.sponsorGas,
|
|
48
|
+
},
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
// default to 4337
|
|
56
53
|
const { defaultChainId } = ecosystemOptions.smartAccountOptions;
|
|
57
54
|
const preferredChain = options.chain ??
|
|
58
55
|
(defaultChainId ? getCachedChain(defaultChainId) : undefined);
|
|
@@ -69,6 +66,25 @@ export function createInAppWallet(args) {
|
|
|
69
66
|
};
|
|
70
67
|
}
|
|
71
68
|
}
|
|
69
|
+
}
|
|
70
|
+
};
|
|
71
|
+
return {
|
|
72
|
+
id: walletId,
|
|
73
|
+
getAuthToken: () => authToken,
|
|
74
|
+
subscribe: emitter.subscribe,
|
|
75
|
+
getChain() {
|
|
76
|
+
if (!chain) {
|
|
77
|
+
return undefined;
|
|
78
|
+
}
|
|
79
|
+
chain = getCachedChainIfExists(chain.id) || chain;
|
|
80
|
+
return chain;
|
|
81
|
+
},
|
|
82
|
+
getConfig: () => createOptions,
|
|
83
|
+
getAccount: () => account,
|
|
84
|
+
autoConnect: async (options) => {
|
|
85
|
+
const { autoConnectInAppWallet } = await import("./index.js");
|
|
86
|
+
const connector = await getOrCreateInAppWalletConnector(options.client, connectorFactory, ecosystem);
|
|
87
|
+
await resolveSmartAccountOptionsFromEcosystem(options);
|
|
72
88
|
const { account: connectedAccount, chain: connectedChain, adminAccount: _adminAccount, } = await autoConnectInAppWallet(options, createOptions, connector);
|
|
73
89
|
// set the states
|
|
74
90
|
client = options.client;
|
|
@@ -95,26 +111,7 @@ export function createInAppWallet(args) {
|
|
|
95
111
|
connect: async (options) => {
|
|
96
112
|
const { connectInAppWallet } = await import("./index.js");
|
|
97
113
|
const connector = await getOrCreateInAppWalletConnector(options.client, connectorFactory, ecosystem);
|
|
98
|
-
|
|
99
|
-
const ecosystemOptions = await getEcosystemInfo(ecosystem.id);
|
|
100
|
-
const smartAccountOptions = ecosystemOptions?.smartAccountOptions;
|
|
101
|
-
if (smartAccountOptions) {
|
|
102
|
-
const { defaultChainId } = ecosystemOptions.smartAccountOptions;
|
|
103
|
-
const preferredChain = options.chain ??
|
|
104
|
-
(defaultChainId ? getCachedChain(defaultChainId) : undefined);
|
|
105
|
-
if (!preferredChain) {
|
|
106
|
-
throw new Error(`A chain must be provided either via 'chain' in connect options or 'defaultChainId' in ecosystem configuration. Please pass it via connect() or update the ecosystem configuration.`);
|
|
107
|
-
}
|
|
108
|
-
createOptions = {
|
|
109
|
-
...createOptions,
|
|
110
|
-
smartAccount: {
|
|
111
|
-
chain: preferredChain,
|
|
112
|
-
sponsorGas: smartAccountOptions.sponsorGas,
|
|
113
|
-
factoryAddress: smartAccountOptions.accountFactoryAddress,
|
|
114
|
-
},
|
|
115
|
-
};
|
|
116
|
-
}
|
|
117
|
-
}
|
|
114
|
+
await resolveSmartAccountOptionsFromEcosystem(options);
|
|
118
115
|
const { account: connectedAccount, chain: connectedChain, adminAccount: _adminAccount, } = await connectInAppWallet(options, createOptions, connector);
|
|
119
116
|
// set the states
|
|
120
117
|
client = options.client;
|
|
@@ -154,24 +151,14 @@ export function createInAppWallet(args) {
|
|
|
154
151
|
emitter.emit("disconnect", undefined);
|
|
155
152
|
},
|
|
156
153
|
switchChain: async (newChain) => {
|
|
157
|
-
if (createOptions?.smartAccount
|
|
154
|
+
if ((createOptions?.smartAccount ||
|
|
155
|
+
createOptions?.executionMode?.mode === "EIP4337") &&
|
|
156
|
+
client &&
|
|
157
|
+
account) {
|
|
158
158
|
// if account abstraction is enabled, reconnect to smart account on the new chain
|
|
159
159
|
const { autoConnectInAppWallet } = await import("./index.js");
|
|
160
160
|
const connector = await getOrCreateInAppWalletConnector(client, connectorFactory, ecosystem);
|
|
161
|
-
|
|
162
|
-
const ecosystemOptions = await getEcosystemInfo(ecosystem.id);
|
|
163
|
-
const smartAccountOptions = ecosystemOptions?.smartAccountOptions;
|
|
164
|
-
if (smartAccountOptions) {
|
|
165
|
-
createOptions = {
|
|
166
|
-
...createOptions,
|
|
167
|
-
smartAccount: {
|
|
168
|
-
chain: newChain,
|
|
169
|
-
sponsorGas: smartAccountOptions.sponsorGas,
|
|
170
|
-
factoryAddress: smartAccountOptions.accountFactoryAddress,
|
|
171
|
-
},
|
|
172
|
-
};
|
|
173
|
-
}
|
|
174
|
-
}
|
|
161
|
+
await resolveSmartAccountOptionsFromEcosystem({ chain: newChain });
|
|
175
162
|
const { account: connectedAccount, chain: connectedChain, adminAccount: _adminAccount, } = await autoConnectInAppWallet({
|
|
176
163
|
chain: newChain,
|
|
177
164
|
client,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"in-app-core.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/wallet/in-app-core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AAEtE,OAAO,EACL,cAAc,EACd,sBAAsB,GACvB,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yDAAyD,CAAC;AAE3F,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAQjE,MAAM,cAAc,GAAG,IAAI,GAAG,EAA0B,CAAC;AAEzD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,+BAA+B,CACnD,MAAsB,EACtB,gBAAqE,EACrE,SAAqB;IAErB,MAAM,GAAG,GAAG,SAAS,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,SAAS;QACT,gBAAgB,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;KAChD,CAAC,CAAC;IACH,IAAI,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QAC5B,OAAO,cAAc,CAAC,GAAG,CAAC,GAAG,CAAmB,CAAC;IACnD,CAAC;IACD,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACjD,cAAc,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IACnC,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAIjC;IACC,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,gBAAgB,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAC5E,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;IACpD,MAAM,OAAO,GAAG,mBAAmB,EAAW,CAAC;IAC/C,IAAI,aAAa,GAAG,cAAc,CAAC;IACnC,IAAI,OAAO,GAAwB,SAAS,CAAC;IAC7C,IAAI,YAAY,GAAwB,SAAS,CAAC,CAAC,qEAAqE;IACxH,IAAI,KAAK,GAAsB,SAAS,CAAC;IACzC,IAAI,MAAkC,CAAC;IACvC,IAAI,SAAS,GAAkB,IAAI,CAAC;IAEpC,
|
|
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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"}
|
package/dist/types/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "5.102.
|
|
1
|
+
export declare const version = "5.102.5";
|
|
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,YAAY,CAAC"}
|
|
@@ -11,7 +11,8 @@ type EcosystemOptions = {
|
|
|
11
11
|
type SmartAccountOptions = {
|
|
12
12
|
defaultChainId: number;
|
|
13
13
|
sponsorGas: boolean;
|
|
14
|
-
accountFactoryAddress
|
|
14
|
+
accountFactoryAddress?: string;
|
|
15
|
+
executionMode?: "EIP4337" | "EIP7702";
|
|
15
16
|
};
|
|
16
17
|
/**
|
|
17
18
|
* Retrieves the specified auth options for a given ecosystem wallet, if any.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-ecosystem-wallet-auth-options.d.ts","sourceRoot":"","sources":["../../../../src/wallets/ecosystem/get-ecosystem-wallet-auth-options.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAE5D,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,qBAAqB,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"get-ecosystem-wallet-auth-options.d.ts","sourceRoot":"","sources":["../../../../src/wallets/ecosystem/get-ecosystem-wallet-auth-options.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAE5D,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,aAAa,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;CACvC,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,iBAAiB,GAC1B,OAAO,CAAC,gBAAgB,CAAC,CAkC3B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"in-app-core.d.ts","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/wallet/in-app-core.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAGnE,OAAO,KAAK,EAAW,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAErE,OAAO,KAAK,EACV,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAI5C;;GAEG;AACH,wBAAsB,+BAA+B,CACnD,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,OAAO,CAAC,cAAc,CAAC,EACrE,SAAS,CAAC,EAAE,SAAS,2BAatB;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IACtC,aAAa,CAAC,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7C,gBAAgB,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IACtE,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB,GAAG,MAAM,CAAC,OAAO,GAAG,iBAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"in-app-core.d.ts","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/wallet/in-app-core.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAGnE,OAAO,KAAK,EAAW,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAErE,OAAO,KAAK,EACV,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAI5C;;GAEG;AACH,wBAAsB,+BAA+B,CACnD,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,OAAO,CAAC,cAAc,CAAC,EACrE,SAAS,CAAC,EAAE,SAAS,2BAatB;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IACtC,aAAa,CAAC,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7C,gBAAgB,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IACtE,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB,GAAG,MAAM,CAAC,OAAO,GAAG,iBAAiB,CAAC,CAwMtC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "thirdweb",
|
|
3
|
-
"version": "5.102.
|
|
3
|
+
"version": "5.102.5",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "git+https://github.com/thirdweb-dev/js.git#main"
|
|
@@ -251,8 +251,8 @@
|
|
|
251
251
|
"uqr": "0.1.2",
|
|
252
252
|
"viem": "2.28.1",
|
|
253
253
|
"zod": "3.25.24",
|
|
254
|
-
"@thirdweb-dev/
|
|
255
|
-
"@thirdweb-dev/
|
|
254
|
+
"@thirdweb-dev/insight": "1.0.2",
|
|
255
|
+
"@thirdweb-dev/engine": "3.0.3"
|
|
256
256
|
},
|
|
257
257
|
"peerDependencies": {
|
|
258
258
|
"@aws-sdk/client-lambda": "^3",
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import type { EIP1193RequestFn, EIP1474Methods } from "viem";
|
|
2
|
+
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
3
|
+
import { ANVIL_CHAIN } from "../../../test/src/chains.js";
|
|
4
|
+
import { TEST_CLIENT } from "../../../test/src/test-clients.js";
|
|
5
|
+
import { getBytecode } from "../../contract/actions/get-bytecode.js";
|
|
6
|
+
import { eth_getStorageAt } from "../../rpc/actions/eth_getStorageAt.js";
|
|
7
|
+
import { getRpcClient } from "../../rpc/rpc.js";
|
|
8
|
+
import { resolveImplementation } from "./resolveImplementation.js";
|
|
9
|
+
|
|
10
|
+
// Mock dependencies
|
|
11
|
+
vi.mock("../../contract/actions/get-bytecode.js");
|
|
12
|
+
vi.mock("../../rpc/rpc.js");
|
|
13
|
+
vi.mock("../../rpc/actions/eth_getStorageAt.js");
|
|
14
|
+
|
|
15
|
+
describe.runIf(process.env.TW_SECRET_KEY)(
|
|
16
|
+
"Handle beacon proxy pattern",
|
|
17
|
+
async () => {
|
|
18
|
+
beforeEach(() => {
|
|
19
|
+
vi.resetAllMocks();
|
|
20
|
+
});
|
|
21
|
+
it("should handle beacon proxy pattern with short storage values", async () => {
|
|
22
|
+
// This test verifies that the implementation can handle short storage values
|
|
23
|
+
// which was the original issue we were trying to fix
|
|
24
|
+
const mockContract = {
|
|
25
|
+
address: "0x0000000000000000000000000000000000000001",
|
|
26
|
+
client: TEST_CLIENT,
|
|
27
|
+
chain: ANVIL_CHAIN,
|
|
28
|
+
} as const;
|
|
29
|
+
|
|
30
|
+
// Mock getBytecode to return a minimal proxy bytecode that will trigger the beacon check
|
|
31
|
+
const mockGetBytecode = vi
|
|
32
|
+
.fn()
|
|
33
|
+
.mockResolvedValueOnce("") // First call for proxy (empty bytecode triggers beacon check)
|
|
34
|
+
.mockResolvedValueOnce("0x1234"); // Second call for implementation
|
|
35
|
+
|
|
36
|
+
vi.mocked(getBytecode).mockImplementation(mockGetBytecode);
|
|
37
|
+
|
|
38
|
+
// Mock eth_getStorageAt to return a short value
|
|
39
|
+
const mockRpcRequest = { request: vi.fn() };
|
|
40
|
+
vi.mocked(getRpcClient).mockReturnValue(
|
|
41
|
+
mockRpcRequest as unknown as EIP1193RequestFn<EIP1474Methods>,
|
|
42
|
+
);
|
|
43
|
+
vi.mocked(eth_getStorageAt).mockResolvedValue("0x1234"); // Short storage value
|
|
44
|
+
|
|
45
|
+
const result = await resolveImplementation(mockContract);
|
|
46
|
+
|
|
47
|
+
// Should not throw and should return some result (even if it's the original address)
|
|
48
|
+
expect(result).toBeDefined();
|
|
49
|
+
expect(result.address).toBeDefined();
|
|
50
|
+
});
|
|
51
|
+
},
|
|
52
|
+
);
|
|
@@ -110,7 +110,10 @@ async function getBeaconFromStorageSlot(
|
|
|
110
110
|
position:
|
|
111
111
|
"0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
|
|
112
112
|
});
|
|
113
|
-
|
|
113
|
+
if (proxyStorage.length >= 40) {
|
|
114
|
+
return `0x${proxyStorage.slice(-40)}`;
|
|
115
|
+
}
|
|
116
|
+
return undefined;
|
|
114
117
|
} catch {
|
|
115
118
|
return undefined;
|
|
116
119
|
}
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = "5.102.
|
|
1
|
+
export const version = "5.102.5";
|
|
@@ -57,6 +57,47 @@ export function createInAppWallet(args: {
|
|
|
57
57
|
let client: ThirdwebClient | undefined;
|
|
58
58
|
let authToken: string | null = null;
|
|
59
59
|
|
|
60
|
+
const resolveSmartAccountOptionsFromEcosystem = async (options: {
|
|
61
|
+
chain?: Chain;
|
|
62
|
+
}) => {
|
|
63
|
+
if (ecosystem) {
|
|
64
|
+
const ecosystemOptions = await getEcosystemInfo(ecosystem.id);
|
|
65
|
+
const smartAccountOptions = ecosystemOptions?.smartAccountOptions;
|
|
66
|
+
if (smartAccountOptions) {
|
|
67
|
+
const executionMode =
|
|
68
|
+
ecosystemOptions.smartAccountOptions.executionMode;
|
|
69
|
+
if (executionMode === "EIP7702") {
|
|
70
|
+
createOptions = {
|
|
71
|
+
...createOptions,
|
|
72
|
+
executionMode: {
|
|
73
|
+
mode: "EIP7702",
|
|
74
|
+
sponsorGas: smartAccountOptions.sponsorGas,
|
|
75
|
+
},
|
|
76
|
+
};
|
|
77
|
+
} else {
|
|
78
|
+
// default to 4337
|
|
79
|
+
const { defaultChainId } = ecosystemOptions.smartAccountOptions;
|
|
80
|
+
const preferredChain =
|
|
81
|
+
options.chain ??
|
|
82
|
+
(defaultChainId ? getCachedChain(defaultChainId) : undefined);
|
|
83
|
+
if (!preferredChain) {
|
|
84
|
+
throw new Error(
|
|
85
|
+
`A chain must be provided either via 'chain' in connect options or 'defaultChainId' in ecosystem configuration. Please pass it via connect() or update the ecosystem configuration.`,
|
|
86
|
+
);
|
|
87
|
+
}
|
|
88
|
+
createOptions = {
|
|
89
|
+
...createOptions,
|
|
90
|
+
smartAccount: {
|
|
91
|
+
chain: preferredChain,
|
|
92
|
+
sponsorGas: smartAccountOptions.sponsorGas,
|
|
93
|
+
factoryAddress: smartAccountOptions.accountFactoryAddress,
|
|
94
|
+
},
|
|
95
|
+
};
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
};
|
|
100
|
+
|
|
60
101
|
return {
|
|
61
102
|
id: walletId,
|
|
62
103
|
getAuthToken: () => authToken,
|
|
@@ -80,30 +121,7 @@ export function createInAppWallet(args: {
|
|
|
80
121
|
ecosystem,
|
|
81
122
|
);
|
|
82
123
|
|
|
83
|
-
|
|
84
|
-
const ecosystemOptions = await getEcosystemInfo(ecosystem.id);
|
|
85
|
-
const smartAccountOptions = ecosystemOptions?.smartAccountOptions;
|
|
86
|
-
if (smartAccountOptions) {
|
|
87
|
-
const { defaultChainId } = ecosystemOptions.smartAccountOptions;
|
|
88
|
-
const preferredChain =
|
|
89
|
-
options.chain ??
|
|
90
|
-
(defaultChainId ? getCachedChain(defaultChainId) : undefined);
|
|
91
|
-
if (!preferredChain) {
|
|
92
|
-
throw new Error(
|
|
93
|
-
`A chain must be provided either via 'chain' in connect options or 'defaultChainId' in ecosystem configuration. Please pass it via connect() or update the ecosystem configuration.`,
|
|
94
|
-
);
|
|
95
|
-
}
|
|
96
|
-
|
|
97
|
-
createOptions = {
|
|
98
|
-
...createOptions,
|
|
99
|
-
smartAccount: {
|
|
100
|
-
chain: preferredChain,
|
|
101
|
-
sponsorGas: smartAccountOptions.sponsorGas,
|
|
102
|
-
factoryAddress: smartAccountOptions.accountFactoryAddress,
|
|
103
|
-
},
|
|
104
|
-
};
|
|
105
|
-
}
|
|
106
|
-
}
|
|
124
|
+
await resolveSmartAccountOptionsFromEcosystem(options);
|
|
107
125
|
|
|
108
126
|
const {
|
|
109
127
|
account: connectedAccount,
|
|
@@ -140,30 +158,7 @@ export function createInAppWallet(args: {
|
|
|
140
158
|
ecosystem,
|
|
141
159
|
);
|
|
142
160
|
|
|
143
|
-
|
|
144
|
-
const ecosystemOptions = await getEcosystemInfo(ecosystem.id);
|
|
145
|
-
const smartAccountOptions = ecosystemOptions?.smartAccountOptions;
|
|
146
|
-
if (smartAccountOptions) {
|
|
147
|
-
const { defaultChainId } = ecosystemOptions.smartAccountOptions;
|
|
148
|
-
const preferredChain =
|
|
149
|
-
options.chain ??
|
|
150
|
-
(defaultChainId ? getCachedChain(defaultChainId) : undefined);
|
|
151
|
-
if (!preferredChain) {
|
|
152
|
-
throw new Error(
|
|
153
|
-
`A chain must be provided either via 'chain' in connect options or 'defaultChainId' in ecosystem configuration. Please pass it via connect() or update the ecosystem configuration.`,
|
|
154
|
-
);
|
|
155
|
-
}
|
|
156
|
-
|
|
157
|
-
createOptions = {
|
|
158
|
-
...createOptions,
|
|
159
|
-
smartAccount: {
|
|
160
|
-
chain: preferredChain,
|
|
161
|
-
sponsorGas: smartAccountOptions.sponsorGas,
|
|
162
|
-
factoryAddress: smartAccountOptions.accountFactoryAddress,
|
|
163
|
-
},
|
|
164
|
-
};
|
|
165
|
-
}
|
|
166
|
-
}
|
|
161
|
+
await resolveSmartAccountOptionsFromEcosystem(options);
|
|
167
162
|
|
|
168
163
|
const {
|
|
169
164
|
account: connectedAccount,
|
|
@@ -212,7 +207,12 @@ export function createInAppWallet(args: {
|
|
|
212
207
|
emitter.emit("disconnect", undefined);
|
|
213
208
|
},
|
|
214
209
|
switchChain: async (newChain) => {
|
|
215
|
-
if (
|
|
210
|
+
if (
|
|
211
|
+
(createOptions?.smartAccount ||
|
|
212
|
+
createOptions?.executionMode?.mode === "EIP4337") &&
|
|
213
|
+
client &&
|
|
214
|
+
account
|
|
215
|
+
) {
|
|
216
216
|
// if account abstraction is enabled, reconnect to smart account on the new chain
|
|
217
217
|
const { autoConnectInAppWallet } = await import("./index.js");
|
|
218
218
|
const connector = await getOrCreateInAppWalletConnector(
|
|
@@ -221,20 +221,7 @@ export function createInAppWallet(args: {
|
|
|
221
221
|
ecosystem,
|
|
222
222
|
);
|
|
223
223
|
|
|
224
|
-
|
|
225
|
-
const ecosystemOptions = await getEcosystemInfo(ecosystem.id);
|
|
226
|
-
const smartAccountOptions = ecosystemOptions?.smartAccountOptions;
|
|
227
|
-
if (smartAccountOptions) {
|
|
228
|
-
createOptions = {
|
|
229
|
-
...createOptions,
|
|
230
|
-
smartAccount: {
|
|
231
|
-
chain: newChain,
|
|
232
|
-
sponsorGas: smartAccountOptions.sponsorGas,
|
|
233
|
-
factoryAddress: smartAccountOptions.accountFactoryAddress,
|
|
234
|
-
},
|
|
235
|
-
};
|
|
236
|
-
}
|
|
237
|
-
}
|
|
224
|
+
await resolveSmartAccountOptionsFromEcosystem({ chain: newChain });
|
|
238
225
|
|
|
239
226
|
const {
|
|
240
227
|
account: connectedAccount,
|