thirdweb 5.105.20 → 5.105.22
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/extensions/erc1155/read/getOwnedNFTs.js +1 -0
- package/dist/cjs/extensions/erc1155/read/getOwnedNFTs.js.map +1 -1
- package/dist/cjs/extensions/erc721/read/getOwnedNFTs.js +1 -0
- package/dist/cjs/extensions/erc721/read/getOwnedNFTs.js.map +1 -1
- package/dist/cjs/insight/get-nfts.js +3 -3
- package/dist/cjs/insight/get-nfts.js.map +1 -1
- package/dist/cjs/insight/get-tokens.js +3 -2
- package/dist/cjs/insight/get-tokens.js.map +1 -1
- package/dist/cjs/react/core/hooks/wallets/useConnect.js +10 -1
- package/dist/cjs/react/core/hooks/wallets/useConnect.js.map +1 -1
- package/dist/cjs/transaction/actions/estimate-gas.js +3 -24
- package/dist/cjs/transaction/actions/estimate-gas.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/cjs/wallets/coinbase/coinbase-web.js +56 -0
- package/dist/cjs/wallets/coinbase/coinbase-web.js.map +1 -1
- package/dist/cjs/wallets/create-wallet.js +62 -13
- package/dist/cjs/wallets/create-wallet.js.map +1 -1
- package/dist/cjs/wallets/eip5792/get-calls-status.js +40 -63
- package/dist/cjs/wallets/eip5792/get-calls-status.js.map +1 -1
- package/dist/cjs/wallets/eip5792/get-capabilities.js +14 -49
- package/dist/cjs/wallets/eip5792/get-capabilities.js.map +1 -1
- package/dist/cjs/wallets/eip5792/send-calls.js +34 -48
- package/dist/cjs/wallets/eip5792/send-calls.js.map +1 -1
- package/dist/cjs/wallets/in-app/core/{eip5972 → eip5792}/in-app-wallet-calls.js +1 -5
- package/dist/cjs/wallets/in-app/core/eip5792/in-app-wallet-calls.js.map +1 -0
- package/dist/cjs/wallets/in-app/core/eip7702/minimal-account.js +650 -5
- package/dist/cjs/wallets/in-app/core/eip7702/minimal-account.js.map +1 -1
- package/dist/cjs/wallets/in-app/core/wallet/enclave-wallet.js +32 -1
- package/dist/cjs/wallets/in-app/core/wallet/enclave-wallet.js.map +1 -1
- package/dist/cjs/wallets/in-app/core/wallet/in-app-core.js +3 -3
- package/dist/cjs/wallets/in-app/core/wallet/in-app-core.js.map +1 -1
- package/dist/cjs/wallets/in-app/web/in-app.js +18 -0
- package/dist/cjs/wallets/in-app/web/in-app.js.map +1 -1
- package/dist/cjs/wallets/injected/index.js +55 -0
- package/dist/cjs/wallets/injected/index.js.map +1 -1
- package/dist/cjs/wallets/smart/index.js +63 -2
- package/dist/cjs/wallets/smart/index.js.map +1 -1
- package/dist/cjs/wallets/smart/smart-wallet.js +1 -1
- package/dist/cjs/wallets/smart/smart-wallet.js.map +1 -1
- package/dist/cjs/wallets/wallet-connect/qr-overlay.js +231 -0
- package/dist/cjs/wallets/wallet-connect/qr-overlay.js.map +1 -0
- package/dist/esm/extensions/erc1155/read/getOwnedNFTs.js +1 -0
- package/dist/esm/extensions/erc1155/read/getOwnedNFTs.js.map +1 -1
- package/dist/esm/extensions/erc721/read/getOwnedNFTs.js +1 -0
- package/dist/esm/extensions/erc721/read/getOwnedNFTs.js.map +1 -1
- package/dist/esm/insight/get-nfts.js +3 -3
- package/dist/esm/insight/get-nfts.js.map +1 -1
- package/dist/esm/insight/get-tokens.js +3 -2
- package/dist/esm/insight/get-tokens.js.map +1 -1
- package/dist/esm/react/core/hooks/wallets/useConnect.js +10 -1
- package/dist/esm/react/core/hooks/wallets/useConnect.js.map +1 -1
- package/dist/esm/transaction/actions/estimate-gas.js +3 -24
- package/dist/esm/transaction/actions/estimate-gas.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/esm/wallets/coinbase/coinbase-web.js +56 -0
- package/dist/esm/wallets/coinbase/coinbase-web.js.map +1 -1
- package/dist/esm/wallets/create-wallet.js +62 -13
- package/dist/esm/wallets/create-wallet.js.map +1 -1
- package/dist/esm/wallets/eip5792/get-calls-status.js +39 -63
- package/dist/esm/wallets/eip5792/get-calls-status.js.map +1 -1
- package/dist/esm/wallets/eip5792/get-capabilities.js +13 -49
- package/dist/esm/wallets/eip5792/get-capabilities.js.map +1 -1
- package/dist/esm/wallets/eip5792/send-calls.js +33 -48
- package/dist/esm/wallets/eip5792/send-calls.js.map +1 -1
- package/dist/esm/wallets/in-app/core/{eip5972 → eip5792}/in-app-wallet-calls.js +1 -5
- package/dist/esm/wallets/in-app/core/eip5792/in-app-wallet-calls.js.map +1 -0
- package/dist/esm/wallets/in-app/core/eip7702/minimal-account.js +650 -5
- package/dist/esm/wallets/in-app/core/eip7702/minimal-account.js.map +1 -1
- package/dist/esm/wallets/in-app/core/wallet/enclave-wallet.js +32 -1
- package/dist/esm/wallets/in-app/core/wallet/enclave-wallet.js.map +1 -1
- package/dist/esm/wallets/in-app/core/wallet/in-app-core.js +3 -3
- package/dist/esm/wallets/in-app/core/wallet/in-app-core.js.map +1 -1
- package/dist/esm/wallets/in-app/web/in-app.js +18 -0
- package/dist/esm/wallets/in-app/web/in-app.js.map +1 -1
- package/dist/esm/wallets/injected/index.js +56 -1
- package/dist/esm/wallets/injected/index.js.map +1 -1
- package/dist/esm/wallets/smart/index.js +63 -2
- package/dist/esm/wallets/smart/index.js.map +1 -1
- package/dist/esm/wallets/smart/smart-wallet.js +1 -1
- package/dist/esm/wallets/smart/smart-wallet.js.map +1 -1
- package/dist/esm/wallets/wallet-connect/qr-overlay.js +228 -0
- package/dist/esm/wallets/wallet-connect/qr-overlay.js.map +1 -0
- package/dist/types/bridge/Webhook.d.ts +2 -2
- package/dist/types/insight/get-nfts.d.ts +1 -0
- package/dist/types/insight/get-nfts.d.ts.map +1 -1
- package/dist/types/insight/get-tokens.d.ts +1 -0
- package/dist/types/insight/get-tokens.d.ts.map +1 -1
- package/dist/types/react/core/hooks/wallets/useConnect.d.ts +1 -0
- package/dist/types/react/core/hooks/wallets/useConnect.d.ts.map +1 -1
- package/dist/types/react/core/hooks/wallets/useWaitForCallsReceipt.d.ts +1 -1
- package/dist/types/react/core/utils/storage.d.ts +1 -1
- package/dist/types/react/web/utils/storage.d.ts +1 -1
- package/dist/types/transaction/actions/estimate-gas.d.ts.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/dist/types/wallets/coinbase/coinbase-web.d.ts.map +1 -1
- package/dist/types/wallets/create-wallet.d.ts.map +1 -1
- package/dist/types/wallets/eip5792/get-calls-status.d.ts +2 -1
- package/dist/types/wallets/eip5792/get-calls-status.d.ts.map +1 -1
- package/dist/types/wallets/eip5792/get-capabilities.d.ts +1 -0
- package/dist/types/wallets/eip5792/get-capabilities.d.ts.map +1 -1
- package/dist/types/wallets/eip5792/send-calls.d.ts +6 -1
- package/dist/types/wallets/eip5792/send-calls.d.ts.map +1 -1
- package/dist/types/wallets/in-app/core/{eip5972 → eip5792}/in-app-wallet-calls.d.ts +3 -2
- package/dist/types/wallets/in-app/core/eip5792/in-app-wallet-calls.d.ts.map +1 -0
- package/dist/types/wallets/in-app/core/eip7702/minimal-account.d.ts.map +1 -1
- package/dist/types/wallets/in-app/core/wallet/enclave-wallet.d.ts.map +1 -1
- package/dist/types/wallets/in-app/web/in-app.d.ts +18 -0
- package/dist/types/wallets/in-app/web/in-app.d.ts.map +1 -1
- package/dist/types/wallets/injected/index.d.ts.map +1 -1
- package/dist/types/wallets/interfaces/wallet.d.ts +22 -0
- package/dist/types/wallets/interfaces/wallet.d.ts.map +1 -1
- package/dist/types/wallets/smart/index.d.ts.map +1 -1
- package/dist/types/wallets/wallet-connect/qr-overlay.d.ts +58 -0
- package/dist/types/wallets/wallet-connect/qr-overlay.d.ts.map +1 -0
- package/dist/types/wallets/wallet-connect/types.d.ts +13 -0
- package/dist/types/wallets/wallet-connect/types.d.ts.map +1 -1
- package/package.json +4 -2
- package/src/extensions/erc1155/read/getOwnedNFTs.ts +1 -0
- package/src/extensions/erc721/read/getOwnedNFTs.ts +1 -0
- package/src/insight/get-nfts.ts +4 -3
- package/src/insight/get-tokens.ts +4 -2
- package/src/react/core/hooks/wallets/useConnect.ts +11 -1
- package/src/transaction/actions/estimate-gas.ts +14 -42
- package/src/version.ts +1 -1
- package/src/wallets/coinbase/coinbase-web.ts +66 -0
- package/src/wallets/create-wallet.ts +85 -24
- package/src/wallets/eip5792/get-calls-status.test.ts +156 -146
- package/src/wallets/eip5792/get-calls-status.ts +44 -73
- package/src/wallets/eip5792/get-capabilities.test.ts +216 -205
- package/src/wallets/eip5792/get-capabilities.ts +23 -64
- package/src/wallets/eip5792/send-calls.test.ts +183 -189
- package/src/wallets/eip5792/send-calls.ts +53 -71
- package/src/wallets/in-app/core/{eip5972 → eip5792}/in-app-wallet-calls.ts +4 -8
- package/src/wallets/in-app/core/eip7702/minimal-account.ts +666 -5
- package/src/wallets/in-app/core/wallet/enclave-wallet.ts +36 -1
- package/src/wallets/in-app/core/wallet/in-app-core.ts +4 -4
- package/src/wallets/in-app/web/in-app.ts +18 -0
- package/src/wallets/injected/index.ts +63 -0
- package/src/wallets/interfaces/wallet.ts +31 -0
- package/src/wallets/smart/index.ts +71 -3
- package/src/wallets/smart/smart-wallet.ts +1 -1
- package/src/wallets/wallet-connect/qr-overlay.ts +322 -0
- package/src/wallets/wallet-connect/types.ts +13 -0
- package/dist/cjs/wallets/in-app/core/eip5972/in-app-wallet-calls.js.map +0 -1
- package/dist/cjs/wallets/in-app/core/eip5972/in-app-wallet-capabilities.js +0 -41
- package/dist/cjs/wallets/in-app/core/eip5972/in-app-wallet-capabilities.js.map +0 -1
- package/dist/cjs/wallets/smart/lib/smart-wallet-capabilities.js +0 -30
- package/dist/cjs/wallets/smart/lib/smart-wallet-capabilities.js.map +0 -1
- package/dist/esm/wallets/in-app/core/eip5972/in-app-wallet-calls.js.map +0 -1
- package/dist/esm/wallets/in-app/core/eip5972/in-app-wallet-capabilities.js +0 -38
- package/dist/esm/wallets/in-app/core/eip5972/in-app-wallet-capabilities.js.map +0 -1
- package/dist/esm/wallets/smart/lib/smart-wallet-capabilities.js +0 -27
- package/dist/esm/wallets/smart/lib/smart-wallet-capabilities.js.map +0 -1
- package/dist/types/wallets/in-app/core/eip5972/in-app-wallet-calls.d.ts.map +0 -1
- package/dist/types/wallets/in-app/core/eip5972/in-app-wallet-capabilities.d.ts +0 -20
- package/dist/types/wallets/in-app/core/eip5972/in-app-wallet-capabilities.d.ts.map +0 -1
- package/dist/types/wallets/smart/lib/smart-wallet-capabilities.d.ts +0 -20
- package/dist/types/wallets/smart/lib/smart-wallet-capabilities.d.ts.map +0 -1
- package/src/wallets/in-app/core/eip5972/in-app-wallet-capabilities.ts +0 -47
- package/src/wallets/smart/lib/smart-wallet-capabilities.ts +0 -32
|
@@ -237,19 +237,68 @@ export function createWallet(...args) {
|
|
|
237
237
|
connect: async (options) => {
|
|
238
238
|
async function wcConnect(wcOptions) {
|
|
239
239
|
const { connectWC } = await import("./wallet-connect/controller.js");
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
240
|
+
let qrOverlay;
|
|
241
|
+
try {
|
|
242
|
+
const [connectedAccount, connectedChain, doDisconnect, doSwitchChain,] = await connectWC({
|
|
243
|
+
...wcOptions,
|
|
244
|
+
walletConnect: {
|
|
245
|
+
...wcOptions.walletConnect,
|
|
246
|
+
onDisplayUri: wcOptions.walletConnect?.showQrModal
|
|
247
|
+
? async (uri) => {
|
|
248
|
+
// Check if we're in a browser environment
|
|
249
|
+
if (typeof window !== "undefined" &&
|
|
250
|
+
typeof document !== "undefined") {
|
|
251
|
+
try {
|
|
252
|
+
const { createQROverlay } = await import("./wallet-connect/qr-overlay.js");
|
|
253
|
+
// Clean up any existing overlay
|
|
254
|
+
if (qrOverlay) {
|
|
255
|
+
qrOverlay.destroy();
|
|
256
|
+
}
|
|
257
|
+
// Create new QR overlay
|
|
258
|
+
qrOverlay = createQROverlay(uri, {
|
|
259
|
+
theme: wcOptions.walletConnect?.qrModalOptions
|
|
260
|
+
?.themeMode ?? "dark",
|
|
261
|
+
qrSize: 280,
|
|
262
|
+
showCloseButton: true,
|
|
263
|
+
onCancel: () => {
|
|
264
|
+
wcOptions.walletConnect?.onCancel?.();
|
|
265
|
+
},
|
|
266
|
+
});
|
|
267
|
+
}
|
|
268
|
+
catch (error) {
|
|
269
|
+
console.error("Failed to create QR overlay:", error);
|
|
270
|
+
}
|
|
271
|
+
}
|
|
272
|
+
}
|
|
273
|
+
: undefined,
|
|
274
|
+
},
|
|
275
|
+
}, emitter, wallet.id, webLocalStorage, sessionHandler);
|
|
276
|
+
// Clean up QR overlay on successful connection
|
|
277
|
+
if (qrOverlay) {
|
|
278
|
+
qrOverlay.destroy();
|
|
279
|
+
qrOverlay = undefined;
|
|
280
|
+
}
|
|
281
|
+
// set the states
|
|
282
|
+
account = connectedAccount;
|
|
283
|
+
chain = connectedChain;
|
|
284
|
+
handleDisconnect = doDisconnect;
|
|
285
|
+
handleSwitchChain = doSwitchChain;
|
|
286
|
+
trackConnect({
|
|
287
|
+
chainId: chain.id,
|
|
288
|
+
client: wcOptions.client,
|
|
289
|
+
walletAddress: account.address,
|
|
290
|
+
walletType: id,
|
|
291
|
+
});
|
|
292
|
+
return account;
|
|
293
|
+
}
|
|
294
|
+
catch (error) {
|
|
295
|
+
// Clean up QR overlay on connection error
|
|
296
|
+
if (qrOverlay) {
|
|
297
|
+
qrOverlay.destroy();
|
|
298
|
+
qrOverlay = undefined;
|
|
299
|
+
}
|
|
300
|
+
throw error;
|
|
301
|
+
}
|
|
253
302
|
}
|
|
254
303
|
if (id === "walletConnect") {
|
|
255
304
|
const { client, chain: _chain, ...walletConnectOptions } = options;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-wallet.js","sourceRoot":"","sources":["../../../src/wallets/create-wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAE7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAKxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"create-wallet.js","sourceRoot":"","sources":["../../../src/wallets/create-wallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,4 @@
|
|
|
1
1
|
import { hexToBigInt, hexToNumber } from "../../utils/encoding/hex.js";
|
|
2
|
-
import { isCoinbaseSDKWallet } from "../coinbase/coinbase-web.js";
|
|
3
|
-
import { isInAppWallet } from "../in-app/core/wallet/index.js";
|
|
4
|
-
import { getInjectedProvider } from "../injected/index.js";
|
|
5
|
-
import { isSmartWallet } from "../smart/index.js";
|
|
6
|
-
import { isWalletConnect } from "../wallet-connect/controller.js";
|
|
7
2
|
/**
|
|
8
3
|
* Get the status of an [EIP-5792](https://eips.ethereum.org/EIPS/eip-5792) bundle.
|
|
9
4
|
*
|
|
@@ -37,69 +32,50 @@ export async function getCallsStatus({ wallet, client, id, }) {
|
|
|
37
32
|
if (!account) {
|
|
38
33
|
throw new Error(`Failed to get call status, no account found for wallet ${wallet.id}`);
|
|
39
34
|
}
|
|
40
|
-
|
|
41
|
-
if (
|
|
42
|
-
|
|
43
|
-
return inAppWalletGetCallsStatus({ client, id, wallet });
|
|
35
|
+
const chain = wallet.getChain();
|
|
36
|
+
if (!chain) {
|
|
37
|
+
throw new Error(`Failed to get call status, no chain found for wallet ${wallet.id}`);
|
|
44
38
|
}
|
|
45
|
-
if (
|
|
46
|
-
|
|
47
|
-
}
|
|
48
|
-
let provider;
|
|
49
|
-
if (isCoinbaseSDKWallet(wallet)) {
|
|
50
|
-
const { getCoinbaseWebProvider } = await import("../coinbase/coinbase-web.js");
|
|
51
|
-
const config = wallet.getConfig();
|
|
52
|
-
provider = (await getCoinbaseWebProvider(config));
|
|
53
|
-
}
|
|
54
|
-
else {
|
|
55
|
-
provider = getInjectedProvider(wallet.id);
|
|
56
|
-
}
|
|
57
|
-
try {
|
|
58
|
-
const { atomic = false, chainId, receipts, version = "2.0.0", ...response } = (await provider.request({
|
|
59
|
-
method: "wallet_getCallsStatus",
|
|
60
|
-
params: [id],
|
|
61
|
-
}));
|
|
62
|
-
const [status, statusCode] = (() => {
|
|
63
|
-
const statusCode = response.status;
|
|
64
|
-
if (statusCode >= 100 && statusCode < 200)
|
|
65
|
-
return ["pending", statusCode];
|
|
66
|
-
if (statusCode >= 200 && statusCode < 300)
|
|
67
|
-
return ["success", statusCode];
|
|
68
|
-
if (statusCode >= 300 && statusCode < 700)
|
|
69
|
-
return ["failure", statusCode];
|
|
70
|
-
// @ts-expect-error: for backwards compatibility
|
|
71
|
-
if (statusCode === "CONFIRMED")
|
|
72
|
-
return ["success", 200];
|
|
73
|
-
// @ts-expect-error: for backwards compatibility
|
|
74
|
-
if (statusCode === "PENDING")
|
|
75
|
-
return ["pending", 100];
|
|
76
|
-
return [undefined, statusCode];
|
|
77
|
-
})();
|
|
78
|
-
return {
|
|
79
|
-
...response,
|
|
80
|
-
atomic,
|
|
81
|
-
// @ts-expect-error: for backwards compatibility
|
|
82
|
-
chainId: chainId ? hexToNumber(chainId) : undefined,
|
|
83
|
-
receipts: receipts?.map((receipt) => ({
|
|
84
|
-
...receipt,
|
|
85
|
-
blockNumber: hexToBigInt(receipt.blockNumber),
|
|
86
|
-
gasUsed: hexToBigInt(receipt.gasUsed),
|
|
87
|
-
status: receiptStatuses[receipt.status],
|
|
88
|
-
})) ?? [],
|
|
89
|
-
status,
|
|
90
|
-
statusCode,
|
|
91
|
-
version,
|
|
92
|
-
};
|
|
93
|
-
}
|
|
94
|
-
catch (error) {
|
|
95
|
-
if (/unsupport|not support/i.test(error.message)) {
|
|
96
|
-
throw new Error(`${wallet.id} does not support wallet_getCallsStatus, reach out to them directly to request EIP-5792 support.`);
|
|
97
|
-
}
|
|
98
|
-
throw error;
|
|
39
|
+
if (account.getCallsStatus) {
|
|
40
|
+
return account.getCallsStatus({ id, chain, client });
|
|
99
41
|
}
|
|
42
|
+
throw new Error(`Failed to get call status, wallet ${wallet.id} does not support EIP-5792`);
|
|
100
43
|
}
|
|
101
44
|
const receiptStatuses = {
|
|
102
45
|
"0x0": "reverted",
|
|
103
46
|
"0x1": "success",
|
|
104
47
|
};
|
|
48
|
+
export function toGetCallsStatusResponse(response) {
|
|
49
|
+
const [status, statusCode] = (() => {
|
|
50
|
+
const statusCode = response.status;
|
|
51
|
+
if (statusCode >= 100 && statusCode < 200)
|
|
52
|
+
return ["pending", statusCode];
|
|
53
|
+
if (statusCode >= 200 && statusCode < 300)
|
|
54
|
+
return ["success", statusCode];
|
|
55
|
+
if (statusCode >= 300 && statusCode < 700)
|
|
56
|
+
return ["failure", statusCode];
|
|
57
|
+
// @ts-expect-error: for backwards compatibility
|
|
58
|
+
if (statusCode === "CONFIRMED")
|
|
59
|
+
return ["success", 200];
|
|
60
|
+
// @ts-expect-error: for backwards compatibility
|
|
61
|
+
if (statusCode === "PENDING")
|
|
62
|
+
return ["pending", 100];
|
|
63
|
+
return [undefined, statusCode];
|
|
64
|
+
})();
|
|
65
|
+
return {
|
|
66
|
+
...response,
|
|
67
|
+
atomic: response.atomic,
|
|
68
|
+
// @ts-expect-error: for backwards compatibility
|
|
69
|
+
chainId: response.chainId ? hexToNumber(response.chainId) : undefined,
|
|
70
|
+
receipts: response.receipts?.map((receipt) => ({
|
|
71
|
+
...receipt,
|
|
72
|
+
blockNumber: hexToBigInt(receipt.blockNumber),
|
|
73
|
+
gasUsed: hexToBigInt(receipt.gasUsed),
|
|
74
|
+
status: receiptStatuses[receipt.status],
|
|
75
|
+
})) ?? [],
|
|
76
|
+
status,
|
|
77
|
+
statusCode,
|
|
78
|
+
version: response.version,
|
|
79
|
+
};
|
|
80
|
+
}
|
|
105
81
|
//# sourceMappingURL=get-calls-status.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-calls-status.js","sourceRoot":"","sources":["../../../../src/wallets/eip5792/get-calls-status.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"get-calls-status.js","sourceRoot":"","sources":["../../../../src/wallets/eip5792/get-calls-status.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAcvE;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EACnC,MAAM,EACN,MAAM,EACN,EAAE,GACoB;IACtB,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;IACpC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CACb,0DAA0D,MAAM,CAAC,EAAE,EAAE,CACtE,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;IAChC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CACb,wDAAwD,MAAM,CAAC,EAAE,EAAE,CACpE,CAAC;IACJ,CAAC;IAED,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;QAC3B,OAAO,OAAO,CAAC,cAAc,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IACvD,CAAC;IAED,MAAM,IAAI,KAAK,CACb,qCAAqC,MAAM,CAAC,EAAE,4BAA4B,CAC3E,CAAC;AACJ,CAAC;AAED,MAAM,eAAe,GAAG;IACtB,KAAK,EAAE,UAAU;IACjB,KAAK,EAAE,SAAS;CACR,CAAC;AAEX,MAAM,UAAU,wBAAwB,CACtC,QAAmC;IAEnC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE;QACjC,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC;QACnC,IAAI,UAAU,IAAI,GAAG,IAAI,UAAU,GAAG,GAAG;YACvC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAU,CAAC;QAC1C,IAAI,UAAU,IAAI,GAAG,IAAI,UAAU,GAAG,GAAG;YACvC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAU,CAAC;QAC1C,IAAI,UAAU,IAAI,GAAG,IAAI,UAAU,GAAG,GAAG;YACvC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAU,CAAC;QAC1C,gDAAgD;QAChD,IAAI,UAAU,KAAK,WAAW;YAAE,OAAO,CAAC,SAAS,EAAE,GAAG,CAAU,CAAC;QACjE,gDAAgD;QAChD,IAAI,UAAU,KAAK,SAAS;YAAE,OAAO,CAAC,SAAS,EAAE,GAAG,CAAU,CAAC;QAC/D,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IACjC,CAAC,CAAC,EAAE,CAAC;IACL,OAAO;QACL,GAAG,QAAQ;QACX,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,gDAAgD;QAChD,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS;QACrE,QAAQ,EACN,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YACnC,GAAG,OAAO;YACV,WAAW,EAAE,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC;YAC7C,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC;YACrC,MAAM,EAAE,eAAe,CAAC,OAAO,CAAC,MAAuB,CAAC;SACzD,CAAC,CAAC,IAAI,EAAE;QACX,MAAM;QACN,UAAU;QACV,OAAO,EAAE,QAAQ,CAAC,OAAO;KAC1B,CAAC;AACJ,CAAC"}
|
|
@@ -1,8 +1,3 @@
|
|
|
1
|
-
import { getAddress } from "../../utils/address.js";
|
|
2
|
-
import { isCoinbaseSDKWallet, } from "../coinbase/coinbase-web.js";
|
|
3
|
-
import { isInAppWallet } from "../in-app/core/wallet/index.js";
|
|
4
|
-
import { getInjectedProvider } from "../injected/index.js";
|
|
5
|
-
import { isWalletConnect } from "../wallet-connect/controller.js";
|
|
6
1
|
/**
|
|
7
2
|
* Get the capabilities of a wallet based on the [EIP-5792](https://eips.ethereum.org/EIPS/eip-5792) specification.
|
|
8
3
|
*
|
|
@@ -30,52 +25,21 @@ export async function getCapabilities({ wallet, chainId, }) {
|
|
|
30
25
|
message: `Can't get capabilities, no account connected for wallet: ${wallet.id}`,
|
|
31
26
|
};
|
|
32
27
|
}
|
|
33
|
-
if (
|
|
34
|
-
|
|
35
|
-
return smartWalletGetCapabilities({ wallet });
|
|
28
|
+
if (account.getCapabilities) {
|
|
29
|
+
return account.getCapabilities({ chainId });
|
|
36
30
|
}
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
}
|
|
47
|
-
let provider;
|
|
48
|
-
if (isCoinbaseSDKWallet(wallet)) {
|
|
49
|
-
const { getCoinbaseWebProvider } = await import("../coinbase/coinbase-web.js");
|
|
50
|
-
const config = wallet.getConfig();
|
|
51
|
-
provider = (await getCoinbaseWebProvider(config));
|
|
52
|
-
}
|
|
53
|
-
else {
|
|
54
|
-
provider = getInjectedProvider(wallet.id);
|
|
55
|
-
}
|
|
56
|
-
try {
|
|
57
|
-
const result = await provider.request({
|
|
58
|
-
method: "wallet_getCapabilities",
|
|
59
|
-
params: [getAddress(account.address)],
|
|
60
|
-
});
|
|
61
|
-
const capabilities = {};
|
|
62
|
-
for (const [chainId, capabilities_] of Object.entries(result)) {
|
|
63
|
-
capabilities[Number(chainId)] = {};
|
|
64
|
-
const capabilitiesCopy = {};
|
|
65
|
-
for (const [key, value] of Object.entries(capabilities_)) {
|
|
66
|
-
capabilitiesCopy[key] = value;
|
|
67
|
-
}
|
|
68
|
-
capabilities[Number(chainId)] = capabilitiesCopy;
|
|
69
|
-
}
|
|
70
|
-
return (typeof chainId === "number" ? capabilities[chainId] : capabilities);
|
|
71
|
-
}
|
|
72
|
-
catch (error) {
|
|
73
|
-
if (/unsupport|not support|not available/i.test(error.message)) {
|
|
74
|
-
return {
|
|
75
|
-
message: `${wallet.id} does not support wallet_getCapabilities, reach out to them directly to request EIP-5792 support.`,
|
|
76
|
-
};
|
|
31
|
+
throw new Error(`Failed to get capabilities, wallet ${wallet.id} does not support EIP-5792`);
|
|
32
|
+
}
|
|
33
|
+
export function toGetCapabilitiesResult(result, chainId) {
|
|
34
|
+
const capabilities = {};
|
|
35
|
+
for (const [chainId, capabilities_] of Object.entries(result)) {
|
|
36
|
+
capabilities[Number(chainId)] = {};
|
|
37
|
+
const capabilitiesCopy = {};
|
|
38
|
+
for (const [key, value] of Object.entries(capabilities_)) {
|
|
39
|
+
capabilitiesCopy[key] = value;
|
|
77
40
|
}
|
|
78
|
-
|
|
41
|
+
capabilities[Number(chainId)] = capabilitiesCopy;
|
|
79
42
|
}
|
|
43
|
+
return (typeof chainId === "number" ? capabilities[chainId] : capabilities);
|
|
80
44
|
}
|
|
81
45
|
//# sourceMappingURL=get-capabilities.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-capabilities.js","sourceRoot":"","sources":["../../../../src/wallets/eip5792/get-capabilities.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get-capabilities.js","sourceRoot":"","sources":["../../../../src/wallets/eip5792/get-capabilities.ts"],"names":[],"mappings":"AAcA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAuC,EAC1E,MAAM,EACN,OAAO,GACoB;IAC3B,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;IACpC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO;YACL,OAAO,EAAE,4DAA4D,MAAM,CAAC,EAAE,EAAE;SACjF,CAAC;IACJ,CAAC;IAED,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;QAC5B,OAAO,OAAO,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,IAAI,KAAK,CACb,sCAAsC,MAAM,CAAC,EAAE,4BAA4B,CAC5E,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,MAA0C,EAC1C,OAAgB;IAEhB,MAAM,YAAY,GAAG,EAGpB,CAAC;IACF,KAAK,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC9D,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC;QACnC,MAAM,gBAAgB,GAAG,EAAwB,CAAC;QAClD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;YACzD,gBAAgB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAChC,CAAC;QACD,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,gBAAgB,CAAC;IACnD,CAAC;IACD,OAAO,CACL,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,YAAY,CAC1D,CAAC;AACb,CAAC"}
|
|
@@ -1,13 +1,7 @@
|
|
|
1
1
|
import { encode } from "../../transaction/actions/encode.js";
|
|
2
2
|
import { getAddress } from "../../utils/address.js";
|
|
3
3
|
import { numberToHex } from "../../utils/encoding/hex.js";
|
|
4
|
-
import { stringify } from "../../utils/json.js";
|
|
5
4
|
import { resolvePromisedValue, } from "../../utils/promise/resolve-promised-value.js";
|
|
6
|
-
import { isCoinbaseSDKWallet, } from "../coinbase/coinbase-web.js";
|
|
7
|
-
import { isInAppWallet } from "../in-app/core/wallet/index.js";
|
|
8
|
-
import { getInjectedProvider } from "../injected/index.js";
|
|
9
|
-
import { isSmartWallet } from "../smart/index.js";
|
|
10
|
-
import { isWalletConnect } from "../wallet-connect/controller.js";
|
|
11
5
|
/**
|
|
12
6
|
* Send [EIP-5792](https://eips.ethereum.org/EIPS/eip-5792) calls to a wallet.
|
|
13
7
|
* This function works with all Thirdweb wallets (in-app and smart) and certain injected wallets that already support EIP-5792.
|
|
@@ -70,10 +64,7 @@ import { isWalletConnect } from "../wallet-connect/controller.js";
|
|
|
70
64
|
* @extension EIP5792
|
|
71
65
|
*/
|
|
72
66
|
export async function sendCalls(options) {
|
|
73
|
-
const { wallet,
|
|
74
|
-
if (!chain) {
|
|
75
|
-
throw new Error(`Cannot send calls, no active chain found for wallet: ${wallet.id}`);
|
|
76
|
-
}
|
|
67
|
+
const { wallet, chain } = options;
|
|
77
68
|
const account = wallet.getAccount();
|
|
78
69
|
if (!account) {
|
|
79
70
|
throw new Error(`Cannot send calls, no account connected for wallet: ${wallet.id}`);
|
|
@@ -82,13 +73,27 @@ export async function sendCalls(options) {
|
|
|
82
73
|
if (!firstCall) {
|
|
83
74
|
throw new Error("No calls to send");
|
|
84
75
|
}
|
|
85
|
-
const
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
76
|
+
const callChain = firstCall.chain || chain;
|
|
77
|
+
if (wallet.getChain()?.id !== callChain.id) {
|
|
78
|
+
await wallet.switchChain(callChain);
|
|
79
|
+
}
|
|
80
|
+
// check internal implementations
|
|
81
|
+
if (account.sendCalls) {
|
|
82
|
+
const { wallet: _, ...optionsWithoutWallet } = options;
|
|
83
|
+
const result = await account.sendCalls(optionsWithoutWallet);
|
|
84
|
+
return {
|
|
85
|
+
...result,
|
|
86
|
+
wallet,
|
|
87
|
+
};
|
|
88
|
+
}
|
|
89
|
+
throw new Error(`Cannot send calls, wallet ${wallet.id} does not support EIP-5792`);
|
|
90
|
+
}
|
|
91
|
+
export async function toProviderCallParams(options, account) {
|
|
92
|
+
const firstCall = options.calls[0];
|
|
93
|
+
if (!firstCall) {
|
|
94
|
+
throw new Error("No calls to send");
|
|
91
95
|
}
|
|
96
|
+
const { calls, capabilities, version = "2.0.0", chain = firstCall.chain, } = options;
|
|
92
97
|
const preparedCalls = await Promise.all(calls.map(async (call) => {
|
|
93
98
|
const { to, value } = call;
|
|
94
99
|
if (to === undefined && call.data === undefined) {
|
|
@@ -99,12 +104,19 @@ export async function sendCalls(options) {
|
|
|
99
104
|
encode(call),
|
|
100
105
|
resolvePromisedValue(value),
|
|
101
106
|
]);
|
|
107
|
+
if (_to) {
|
|
108
|
+
return {
|
|
109
|
+
data: _data,
|
|
110
|
+
to: getAddress(_to),
|
|
111
|
+
value: typeof _value === "bigint" || typeof _value === "number"
|
|
112
|
+
? numberToHex(_value)
|
|
113
|
+
: undefined,
|
|
114
|
+
};
|
|
115
|
+
}
|
|
102
116
|
return {
|
|
103
117
|
data: _data,
|
|
104
|
-
to:
|
|
105
|
-
value:
|
|
106
|
-
? numberToHex(_value)
|
|
107
|
-
: undefined,
|
|
118
|
+
to: undefined,
|
|
119
|
+
value: undefined,
|
|
108
120
|
};
|
|
109
121
|
}));
|
|
110
122
|
const injectedWalletCallParams = [
|
|
@@ -118,33 +130,6 @@ export async function sendCalls(options) {
|
|
|
118
130
|
version,
|
|
119
131
|
},
|
|
120
132
|
];
|
|
121
|
-
|
|
122
|
-
throw new Error("sendCalls is not yet supported for Wallet Connect");
|
|
123
|
-
}
|
|
124
|
-
let provider;
|
|
125
|
-
if (isCoinbaseSDKWallet(wallet)) {
|
|
126
|
-
const { getCoinbaseWebProvider } = await import("../coinbase/coinbase-web.js");
|
|
127
|
-
const config = wallet.getConfig();
|
|
128
|
-
provider = (await getCoinbaseWebProvider(config));
|
|
129
|
-
}
|
|
130
|
-
else {
|
|
131
|
-
provider = getInjectedProvider(wallet.id);
|
|
132
|
-
}
|
|
133
|
-
try {
|
|
134
|
-
const callId = await provider.request({
|
|
135
|
-
method: "wallet_sendCalls",
|
|
136
|
-
params: injectedWalletCallParams, // The viem type definition is slightly different
|
|
137
|
-
});
|
|
138
|
-
if (typeof callId === "object" && "id" in callId) {
|
|
139
|
-
return { chain, client, id: callId.id, wallet };
|
|
140
|
-
}
|
|
141
|
-
return { chain, client, id: callId, wallet };
|
|
142
|
-
}
|
|
143
|
-
catch (error) {
|
|
144
|
-
if (/unsupport|not support/i.test(error.message)) {
|
|
145
|
-
throw new Error(`${wallet.id} errored calling wallet_sendCalls, with error: ${error instanceof Error ? error.message : stringify(error)}`);
|
|
146
|
-
}
|
|
147
|
-
throw error;
|
|
148
|
-
}
|
|
133
|
+
return { callParams: injectedWalletCallParams, chain };
|
|
149
134
|
}
|
|
150
135
|
//# sourceMappingURL=send-calls.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send-calls.js","sourceRoot":"","sources":["../../../../src/wallets/eip5792/send-calls.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,qCAAqC,CAAC;AAE7D,OAAO,
|
|
1
|
+
{"version":3,"file":"send-calls.js","sourceRoot":"","sources":["../../../../src/wallets/eip5792/send-calls.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,11 +37,7 @@ export async function inAppWalletSendCalls(args) {
|
|
|
37
37
|
* @internal
|
|
38
38
|
*/
|
|
39
39
|
export async function inAppWalletGetCallsStatus(args) {
|
|
40
|
-
const {
|
|
41
|
-
const chain = wallet.getChain();
|
|
42
|
-
if (!chain) {
|
|
43
|
-
throw new Error("Failed to get calls status, no active chain found");
|
|
44
|
-
}
|
|
40
|
+
const { chain, client, id } = args;
|
|
45
41
|
const bundle = bundlesToTransactions.get(id);
|
|
46
42
|
if (!bundle) {
|
|
47
43
|
throw new Error("Failed to get calls status, unknown bundle id");
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"in-app-wallet-calls.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/eip5792/in-app-wallet-calls.ts"],"names":[],"mappings":"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"}
|