thirdweb 5.98.1 → 5.99.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/exports/react.js +11 -8
- package/dist/cjs/exports/react.js.map +1 -1
- package/dist/cjs/exports/react.native.js +11 -8
- package/dist/cjs/exports/react.native.js.map +1 -1
- package/dist/cjs/exports/wallets/eip5792.js +7 -3
- package/dist/cjs/exports/wallets/eip5792.js.map +1 -1
- package/dist/cjs/extensions/erc20/read/getCurrencyMetadata.js +2 -2
- package/dist/cjs/extensions/erc20/read/getCurrencyMetadata.js.map +1 -1
- package/dist/cjs/react/core/hooks/wallets/useCapabilities.js +5 -6
- package/dist/cjs/react/core/hooks/wallets/useCapabilities.js.map +1 -1
- package/dist/cjs/react/core/hooks/wallets/useSendAndConfirmCalls.js +99 -0
- package/dist/cjs/react/core/hooks/wallets/useSendAndConfirmCalls.js.map +1 -0
- package/dist/cjs/react/core/hooks/wallets/useSendCalls.js +32 -40
- package/dist/cjs/react/core/hooks/wallets/useSendCalls.js.map +1 -1
- package/dist/cjs/react/core/hooks/wallets/useWaitForCallsReceipt.js +38 -0
- package/dist/cjs/react/core/hooks/wallets/useWaitForCallsReceipt.js.map +1 -0
- package/dist/cjs/react/core/providers/thirdweb-provider.js +4 -3
- package/dist/cjs/react/core/providers/thirdweb-provider.js.map +1 -1
- package/dist/cjs/react/native/ui/connect/ConnectButton.js +4 -1
- package/dist/cjs/react/native/ui/connect/ConnectButton.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/ConnectButton.js +6 -4
- package/dist/cjs/react/web/ui/ConnectWallet/ConnectButton.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/Modal/ConnectEmbed.js +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/Modal/ConnectEmbed.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/fiat/OnRampScreen.js +5 -15
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/fiat/OnRampScreen.js.map +1 -1
- package/dist/cjs/react/web/ui/PayEmbed.js +8 -1
- package/dist/cjs/react/web/ui/PayEmbed.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/cjs/wallets/coinbase/coinbase-web.js +2 -85
- package/dist/cjs/wallets/coinbase/coinbase-web.js.map +1 -1
- package/dist/cjs/wallets/connection/autoConnectCore.js +29 -12
- package/dist/cjs/wallets/connection/autoConnectCore.js.map +1 -1
- package/dist/cjs/wallets/eip5792/get-calls-status.js +54 -15
- package/dist/cjs/wallets/eip5792/get-calls-status.js.map +1 -1
- package/dist/cjs/wallets/eip5792/get-capabilities.js +21 -8
- package/dist/cjs/wallets/eip5792/get-capabilities.js.map +1 -1
- package/dist/cjs/wallets/eip5792/send-and-confirm-calls.js +41 -0
- package/dist/cjs/wallets/eip5792/send-and-confirm-calls.js.map +1 -0
- package/dist/cjs/wallets/eip5792/send-calls.js +27 -14
- package/dist/cjs/wallets/eip5792/send-calls.js.map +1 -1
- package/dist/cjs/wallets/eip5792/show-calls-status.js +8 -7
- package/dist/cjs/wallets/eip5792/show-calls-status.js.map +1 -1
- package/dist/cjs/wallets/eip5792/{wait-for-bundle.js → wait-for-calls-receipt.js} +23 -10
- package/dist/cjs/wallets/eip5792/wait-for-calls-receipt.js.map +1 -0
- package/dist/cjs/wallets/in-app/core/eip5972/in-app-wallet-calls.js +15 -10
- package/dist/cjs/wallets/in-app/core/eip5972/in-app-wallet-calls.js.map +1 -1
- package/dist/cjs/wallets/in-app/core/eip5972/in-app-wallet-capabilities.js +13 -3
- package/dist/cjs/wallets/in-app/core/eip5972/in-app-wallet-capabilities.js.map +1 -1
- package/dist/cjs/wallets/in-app/core/wallet/is-in-app-signer.js +15 -0
- package/dist/cjs/wallets/in-app/core/wallet/is-in-app-signer.js.map +1 -0
- package/dist/cjs/wallets/smart/lib/smart-wallet-capabilities.js +4 -2
- package/dist/cjs/wallets/smart/lib/smart-wallet-capabilities.js.map +1 -1
- package/dist/esm/exports/react.js +5 -3
- package/dist/esm/exports/react.js.map +1 -1
- package/dist/esm/exports/react.native.js +5 -3
- package/dist/esm/exports/react.native.js.map +1 -1
- package/dist/esm/exports/wallets/eip5792.js +3 -1
- package/dist/esm/exports/wallets/eip5792.js.map +1 -1
- package/dist/esm/extensions/erc20/read/getCurrencyMetadata.js +2 -2
- package/dist/esm/extensions/erc20/read/getCurrencyMetadata.js.map +1 -1
- package/dist/esm/react/core/hooks/wallets/useCapabilities.js +5 -6
- package/dist/esm/react/core/hooks/wallets/useCapabilities.js.map +1 -1
- package/dist/esm/react/core/hooks/wallets/useSendAndConfirmCalls.js +96 -0
- package/dist/esm/react/core/hooks/wallets/useSendAndConfirmCalls.js.map +1 -0
- package/dist/esm/react/core/hooks/wallets/useSendCalls.js +32 -40
- package/dist/esm/react/core/hooks/wallets/useSendCalls.js.map +1 -1
- package/dist/esm/react/core/hooks/wallets/useWaitForCallsReceipt.js +35 -0
- package/dist/esm/react/core/hooks/wallets/useWaitForCallsReceipt.js.map +1 -0
- package/dist/esm/react/core/providers/thirdweb-provider.js +4 -3
- package/dist/esm/react/core/providers/thirdweb-provider.js.map +1 -1
- package/dist/esm/react/native/ui/connect/ConnectButton.js +4 -1
- package/dist/esm/react/native/ui/connect/ConnectButton.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/ConnectButton.js +6 -4
- package/dist/esm/react/web/ui/ConnectWallet/ConnectButton.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/Modal/ConnectEmbed.js +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/Modal/ConnectEmbed.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/fiat/OnRampScreen.js +1 -11
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/fiat/OnRampScreen.js.map +1 -1
- package/dist/esm/react/web/ui/PayEmbed.js +8 -1
- package/dist/esm/react/web/ui/PayEmbed.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/esm/wallets/coinbase/coinbase-web.js +2 -81
- package/dist/esm/wallets/coinbase/coinbase-web.js.map +1 -1
- package/dist/esm/wallets/connection/autoConnectCore.js +29 -12
- package/dist/esm/wallets/connection/autoConnectCore.js.map +1 -1
- package/dist/esm/wallets/eip5792/get-calls-status.js +54 -15
- package/dist/esm/wallets/eip5792/get-calls-status.js.map +1 -1
- package/dist/esm/wallets/eip5792/get-capabilities.js +22 -9
- package/dist/esm/wallets/eip5792/get-capabilities.js.map +1 -1
- package/dist/esm/wallets/eip5792/send-and-confirm-calls.js +38 -0
- package/dist/esm/wallets/eip5792/send-and-confirm-calls.js.map +1 -0
- package/dist/esm/wallets/eip5792/send-calls.js +28 -15
- package/dist/esm/wallets/eip5792/send-calls.js.map +1 -1
- package/dist/esm/wallets/eip5792/show-calls-status.js +9 -8
- package/dist/esm/wallets/eip5792/show-calls-status.js.map +1 -1
- package/dist/esm/wallets/eip5792/{wait-for-bundle.js → wait-for-calls-receipt.js} +22 -9
- package/dist/esm/wallets/eip5792/wait-for-calls-receipt.js.map +1 -0
- package/dist/esm/wallets/in-app/core/eip5972/in-app-wallet-calls.js +15 -10
- package/dist/esm/wallets/in-app/core/eip5972/in-app-wallet-calls.js.map +1 -1
- package/dist/esm/wallets/in-app/core/eip5972/in-app-wallet-capabilities.js +13 -3
- package/dist/esm/wallets/in-app/core/eip5972/in-app-wallet-capabilities.js.map +1 -1
- package/dist/esm/wallets/in-app/core/wallet/is-in-app-signer.js +12 -0
- package/dist/esm/wallets/in-app/core/wallet/is-in-app-signer.js.map +1 -0
- package/dist/esm/wallets/smart/lib/smart-wallet-capabilities.js +4 -2
- package/dist/esm/wallets/smart/lib/smart-wallet-capabilities.js.map +1 -1
- package/dist/types/exports/react.d.ts +4 -3
- package/dist/types/exports/react.d.ts.map +1 -1
- package/dist/types/exports/react.native.d.ts +4 -3
- package/dist/types/exports/react.native.d.ts.map +1 -1
- package/dist/types/exports/wallets/eip5792.d.ts +3 -1
- package/dist/types/exports/wallets/eip5792.d.ts.map +1 -1
- package/dist/types/react/core/hooks/wallets/useCapabilities.d.ts +1 -0
- package/dist/types/react/core/hooks/wallets/useCapabilities.d.ts.map +1 -1
- package/dist/types/react/core/hooks/wallets/useSendAndConfirmCalls.d.ts +66 -0
- package/dist/types/react/core/hooks/wallets/useSendAndConfirmCalls.d.ts.map +1 -0
- package/dist/types/react/core/hooks/wallets/useSendCalls.d.ts +8 -11
- package/dist/types/react/core/hooks/wallets/useSendCalls.d.ts.map +1 -1
- package/dist/types/react/core/hooks/wallets/useWaitForCallsReceipt.d.ts +32 -0
- package/dist/types/react/core/hooks/wallets/useWaitForCallsReceipt.d.ts.map +1 -0
- package/dist/types/react/core/providers/thirdweb-provider.d.ts.map +1 -1
- package/dist/types/react/native/ui/connect/ConnectButton.d.ts.map +1 -1
- package/dist/types/react/web/ui/ConnectWallet/ConnectButton.d.ts.map +1 -1
- package/dist/types/react/web/ui/ConnectWallet/Modal/ConnectEmbed.d.ts.map +1 -1
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/fiat/OnRampScreen.d.ts.map +1 -1
- package/dist/types/react/web/ui/PayEmbed.d.ts +1 -1
- package/dist/types/react/web/ui/PayEmbed.d.ts.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/dist/types/wallets/coinbase/coinbase-web.d.ts +2 -30
- package/dist/types/wallets/coinbase/coinbase-web.d.ts.map +1 -1
- package/dist/types/wallets/connection/autoConnectCore.d.ts.map +1 -1
- package/dist/types/wallets/connection/types.d.ts +9 -0
- package/dist/types/wallets/connection/types.d.ts.map +1 -1
- package/dist/types/wallets/eip5792/get-calls-status.d.ts +5 -6
- package/dist/types/wallets/eip5792/get-calls-status.d.ts.map +1 -1
- package/dist/types/wallets/eip5792/get-capabilities.d.ts +2 -1
- package/dist/types/wallets/eip5792/get-capabilities.d.ts.map +1 -1
- package/dist/types/wallets/eip5792/send-and-confirm-calls.d.ts +39 -0
- package/dist/types/wallets/eip5792/send-and-confirm-calls.d.ts.map +1 -0
- package/dist/types/wallets/eip5792/send-calls.d.ts +12 -5
- package/dist/types/wallets/eip5792/send-calls.d.ts.map +1 -1
- package/dist/types/wallets/eip5792/show-calls-status.d.ts +2 -2
- package/dist/types/wallets/eip5792/show-calls-status.d.ts.map +1 -1
- package/dist/types/wallets/eip5792/types.d.ts +33 -4
- package/dist/types/wallets/eip5792/types.d.ts.map +1 -1
- package/dist/types/wallets/eip5792/{wait-for-bundle.d.ts → wait-for-calls-receipt.d.ts} +21 -9
- package/dist/types/wallets/eip5792/wait-for-calls-receipt.d.ts.map +1 -0
- package/dist/types/wallets/in-app/core/eip5972/in-app-wallet-calls.d.ts +3 -3
- package/dist/types/wallets/in-app/core/eip5972/in-app-wallet-calls.d.ts.map +1 -1
- package/dist/types/wallets/in-app/core/eip5972/in-app-wallet-capabilities.d.ts +3 -3
- package/dist/types/wallets/in-app/core/eip5972/in-app-wallet-capabilities.d.ts.map +1 -1
- package/dist/types/wallets/in-app/core/wallet/is-in-app-signer.d.ts +6 -0
- package/dist/types/wallets/in-app/core/wallet/is-in-app-signer.d.ts.map +1 -0
- package/dist/types/wallets/smart/lib/smart-wallet-capabilities.d.ts +2 -2
- package/dist/types/wallets/smart/lib/smart-wallet-capabilities.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/exports/react.native.ts +6 -3
- package/src/exports/react.ts +6 -3
- package/src/exports/wallets/eip5792.ts +5 -3
- package/src/extensions/erc20/read/getCurrencyMetadata.ts +2 -2
- package/src/react/core/hooks/wallets/useCapabilities.ts +6 -6
- package/src/react/core/hooks/wallets/useSendAndConfirmCalls.ts +114 -0
- package/src/react/core/hooks/wallets/useSendCalls.ts +33 -50
- package/src/react/core/hooks/wallets/useWaitForCallsReceipt.ts +43 -0
- package/src/react/core/providers/thirdweb-provider.tsx +4 -3
- package/src/react/native/ui/connect/ConnectButton.tsx +4 -1
- package/src/react/web/ui/ConnectWallet/ConnectButton.tsx +11 -3
- package/src/react/web/ui/ConnectWallet/Modal/ConnectEmbed.tsx +1 -0
- package/src/react/web/ui/ConnectWallet/screens/Buy/fiat/OnRampScreen.tsx +1 -21
- package/src/react/web/ui/PayEmbed.tsx +15 -1
- package/src/version.ts +1 -1
- package/src/wallets/coinbase/coinbase-web.ts +6 -117
- package/src/wallets/connection/autoConnectCore.ts +33 -12
- package/src/wallets/connection/types.ts +10 -0
- package/src/wallets/eip5792/get-calls-status.test.ts +27 -33
- package/src/wallets/eip5792/get-calls-status.ts +68 -19
- package/src/wallets/eip5792/get-capabilities.test.ts +10 -10
- package/src/wallets/eip5792/get-capabilities.ts +33 -11
- package/src/wallets/eip5792/send-and-confirm-calls.ts +48 -0
- package/src/wallets/eip5792/send-calls.test.ts +7 -7
- package/src/wallets/eip5792/send-calls.ts +43 -21
- package/src/wallets/eip5792/show-calls-status.test.ts +3 -3
- package/src/wallets/eip5792/show-calls-status.ts +13 -12
- package/src/wallets/eip5792/types.ts +43 -4
- package/src/wallets/eip5792/{wait-for-bundle.test.ts → wait-for-calls-receipt.test.ts} +19 -9
- package/src/wallets/eip5792/{wait-for-bundle.ts → wait-for-calls-receipt.ts} +26 -16
- package/src/wallets/in-app/core/eip5972/in-app-wallet-calls.ts +17 -16
- package/src/wallets/in-app/core/eip5972/in-app-wallet-capabilities.ts +14 -3
- package/src/wallets/in-app/core/wallet/is-in-app-signer.ts +21 -0
- package/src/wallets/smart/lib/smart-wallet-capabilities.ts +5 -2
- package/dist/cjs/react/core/hooks/wallets/useCallsStatus.js +0 -41
- package/dist/cjs/react/core/hooks/wallets/useCallsStatus.js.map +0 -1
- package/dist/cjs/wallets/eip5792/wait-for-bundle.js.map +0 -1
- package/dist/esm/react/core/hooks/wallets/useCallsStatus.js +0 -38
- package/dist/esm/react/core/hooks/wallets/useCallsStatus.js.map +0 -1
- package/dist/esm/wallets/eip5792/wait-for-bundle.js.map +0 -1
- package/dist/types/react/core/hooks/wallets/useCallsStatus.d.ts +0 -26
- package/dist/types/react/core/hooks/wallets/useCallsStatus.d.ts.map +0 -1
- package/dist/types/wallets/eip5792/wait-for-bundle.d.ts.map +0 -1
- package/src/react/core/hooks/wallets/useCallsStatus.ts +0 -48
@@ -1,6 +1,8 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.getCallsStatus = getCallsStatus;
|
4
|
+
const hex_js_1 = require("../../utils/encoding/hex.js");
|
5
|
+
const hex_js_2 = require("../../utils/encoding/hex.js");
|
4
6
|
const coinbase_web_js_1 = require("../coinbase/coinbase-web.js");
|
5
7
|
const index_js_1 = require("../in-app/core/wallet/index.js");
|
6
8
|
const index_js_2 = require("../injected/index.js");
|
@@ -25,17 +27,16 @@ const controller_js_1 = require("../wallet-connect/controller.js");
|
|
25
27
|
*
|
26
28
|
* const client = createThirdwebClient({ clientId: ... });
|
27
29
|
*
|
28
|
-
* const
|
30
|
+
* const result = await sendCalls({ wallet, client, calls });
|
29
31
|
*
|
30
32
|
* let result;
|
31
|
-
* while (result.status !== "
|
32
|
-
* result = await getCallsStatus(
|
33
|
+
* while (result.status !== "success") {
|
34
|
+
* result = await getCallsStatus(result);
|
33
35
|
* }
|
34
36
|
* ```
|
35
37
|
* @extension EIP5792
|
36
|
-
* @extension EIP5792
|
37
38
|
*/
|
38
|
-
async function getCallsStatus({ wallet, client,
|
39
|
+
async function getCallsStatus({ wallet, client, id, }) {
|
39
40
|
const account = wallet.getAccount();
|
40
41
|
if (!account) {
|
41
42
|
throw new Error(`Failed to get call status, no account found for wallet ${wallet.id}`);
|
@@ -43,22 +44,56 @@ async function getCallsStatus({ wallet, client, bundleId, }) {
|
|
43
44
|
// These conveniently operate the same
|
44
45
|
if ((0, index_js_3.isSmartWallet)(wallet) || (0, index_js_1.isInAppWallet)(wallet)) {
|
45
46
|
const { inAppWalletGetCallsStatus } = await Promise.resolve().then(() => require("../in-app/core/eip5972/in-app-wallet-calls.js"));
|
46
|
-
return inAppWalletGetCallsStatus({ wallet, client,
|
47
|
-
}
|
48
|
-
if ((0, coinbase_web_js_1.isCoinbaseSDKWallet)(wallet)) {
|
49
|
-
const { coinbaseSDKWalletGetCallsStatus } = await Promise.resolve().then(() => require("../coinbase/coinbase-web.js"));
|
50
|
-
return coinbaseSDKWalletGetCallsStatus({ wallet, bundleId });
|
47
|
+
return inAppWalletGetCallsStatus({ wallet, client, id });
|
51
48
|
}
|
52
49
|
if ((0, controller_js_1.isWalletConnect)(wallet)) {
|
53
50
|
throw new Error("getCallsStatus is not yet supported for Wallet Connect");
|
54
51
|
}
|
55
|
-
|
56
|
-
|
52
|
+
let provider;
|
53
|
+
if ((0, coinbase_web_js_1.isCoinbaseSDKWallet)(wallet)) {
|
54
|
+
const { getCoinbaseWebProvider } = await Promise.resolve().then(() => require("../coinbase/coinbase-web.js"));
|
55
|
+
const config = wallet.getConfig();
|
56
|
+
provider = (await getCoinbaseWebProvider(config));
|
57
|
+
}
|
58
|
+
else {
|
59
|
+
provider = (0, index_js_2.getInjectedProvider)(wallet.id);
|
60
|
+
}
|
57
61
|
try {
|
58
|
-
|
62
|
+
const { atomic = false, chainId, receipts, version = "2.0.0", ...response } = (await provider.request({
|
59
63
|
method: "wallet_getCallsStatus",
|
60
|
-
params: [
|
61
|
-
});
|
64
|
+
params: [id],
|
65
|
+
}));
|
66
|
+
const [status, statusCode] = (() => {
|
67
|
+
const statusCode = response.status;
|
68
|
+
if (statusCode >= 100 && statusCode < 200)
|
69
|
+
return ["pending", statusCode];
|
70
|
+
if (statusCode >= 200 && statusCode < 300)
|
71
|
+
return ["success", statusCode];
|
72
|
+
if (statusCode >= 300 && statusCode < 700)
|
73
|
+
return ["failure", statusCode];
|
74
|
+
// @ts-expect-error: for backwards compatibility
|
75
|
+
if (statusCode === "CONFIRMED")
|
76
|
+
return ["success", 200];
|
77
|
+
// @ts-expect-error: for backwards compatibility
|
78
|
+
if (statusCode === "PENDING")
|
79
|
+
return ["pending", 100];
|
80
|
+
return [undefined, statusCode];
|
81
|
+
})();
|
82
|
+
return {
|
83
|
+
...response,
|
84
|
+
atomic,
|
85
|
+
// @ts-expect-error: for backwards compatibility
|
86
|
+
chainId: chainId ? (0, hex_js_2.hexToNumber)(chainId) : undefined,
|
87
|
+
receipts: receipts?.map((receipt) => ({
|
88
|
+
...receipt,
|
89
|
+
blockNumber: (0, hex_js_1.hexToBigInt)(receipt.blockNumber),
|
90
|
+
gasUsed: (0, hex_js_1.hexToBigInt)(receipt.gasUsed),
|
91
|
+
status: receiptStatuses[receipt.status],
|
92
|
+
})) ?? [],
|
93
|
+
statusCode,
|
94
|
+
status,
|
95
|
+
version,
|
96
|
+
};
|
62
97
|
}
|
63
98
|
catch (error) {
|
64
99
|
if (/unsupport|not support/i.test(error.message)) {
|
@@ -67,4 +102,8 @@ async function getCallsStatus({ wallet, client, bundleId, }) {
|
|
67
102
|
throw error;
|
68
103
|
}
|
69
104
|
}
|
105
|
+
const receiptStatuses = {
|
106
|
+
"0x0": "reverted",
|
107
|
+
"0x1": "success",
|
108
|
+
};
|
70
109
|
//# 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":";;
|
1
|
+
{"version":3,"file":"get-calls-status.js","sourceRoot":"","sources":["../../../../src/wallets/eip5792/get-calls-status.ts"],"names":[],"mappings":"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"}
|
@@ -26,7 +26,7 @@ const controller_js_1 = require("../wallet-connect/controller.js");
|
|
26
26
|
*
|
27
27
|
* @extension EIP5792
|
28
28
|
*/
|
29
|
-
async function getCapabilities({ wallet, }) {
|
29
|
+
async function getCapabilities({ wallet, chainId, }) {
|
30
30
|
const account = wallet.getAccount();
|
31
31
|
if (!account) {
|
32
32
|
return {
|
@@ -41,23 +41,36 @@ async function getCapabilities({ wallet, }) {
|
|
41
41
|
const { inAppWalletGetCapabilities } = await Promise.resolve().then(() => require("../in-app/core/eip5972/in-app-wallet-capabilities.js"));
|
42
42
|
return inAppWalletGetCapabilities({ wallet });
|
43
43
|
}
|
44
|
-
if ((0, coinbase_web_js_1.isCoinbaseSDKWallet)(wallet)) {
|
45
|
-
const { coinbaseSDKWalletGetCapabilities } = await Promise.resolve().then(() => require("../coinbase/coinbase-web.js"));
|
46
|
-
return coinbaseSDKWalletGetCapabilities({ wallet });
|
47
|
-
}
|
48
44
|
// TODO: Add Wallet Connect support
|
49
45
|
if ((0, controller_js_1.isWalletConnect)(wallet)) {
|
50
46
|
return {
|
51
47
|
message: "getCapabilities is not yet supported with Wallet Connect",
|
52
48
|
};
|
53
49
|
}
|
54
|
-
|
55
|
-
|
50
|
+
let provider;
|
51
|
+
if ((0, coinbase_web_js_1.isCoinbaseSDKWallet)(wallet)) {
|
52
|
+
const { getCoinbaseWebProvider } = await Promise.resolve().then(() => require("../coinbase/coinbase-web.js"));
|
53
|
+
const config = wallet.getConfig();
|
54
|
+
provider = (await getCoinbaseWebProvider(config));
|
55
|
+
}
|
56
|
+
else {
|
57
|
+
provider = (0, index_js_2.getInjectedProvider)(wallet.id);
|
58
|
+
}
|
56
59
|
try {
|
57
|
-
|
60
|
+
const result = await provider.request({
|
58
61
|
method: "wallet_getCapabilities",
|
59
62
|
params: [(0, address_js_1.getAddress)(account.address)],
|
60
63
|
});
|
64
|
+
const capabilities = {};
|
65
|
+
for (const [chainId, capabilities_] of Object.entries(result)) {
|
66
|
+
capabilities[Number(chainId)] = {};
|
67
|
+
const capabilitiesCopy = {};
|
68
|
+
for (const [key, value] of Object.entries(capabilities_)) {
|
69
|
+
capabilitiesCopy[key] = value;
|
70
|
+
}
|
71
|
+
capabilities[Number(chainId)] = capabilitiesCopy;
|
72
|
+
}
|
73
|
+
return (typeof chainId === "number" ? capabilities[chainId] : capabilities);
|
61
74
|
}
|
62
75
|
catch (error) {
|
63
76
|
if (/unsupport|not support|not available/i.test(error.message)) {
|
@@ -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":";;AA2CA,0CAuEC;AAlHD,uDAAoD;AAEpD,iEAGqC;AACrC,6DAA+D;AAC/D,mDAA2D;AAG3D,mEAAkE;AAalE;;;;;;;;;;;;;;;;;;;GAmBG;AACI,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,MAAM,CAAC,EAAE,KAAK,OAAO,EAAE,CAAC;QAC1B,MAAM,EAAE,0BAA0B,EAAE,GAAG,2CACrC,2CAA2C,EAC5C,CAAC;QACF,OAAO,0BAA0B,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,IAAA,wBAAa,EAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,MAAM,EAAE,0BAA0B,EAAE,GAAG,2CACrC,sDAAsD,EACvD,CAAC;QACF,OAAO,0BAA0B,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,mCAAmC;IACnC,IAAI,IAAA,+BAAe,EAAC,MAAM,CAAC,EAAE,CAAC;QAC5B,OAAO;YACL,OAAO,EAAE,0DAA0D;SACpE,CAAC;IACJ,CAAC;IAED,IAAI,QAAkB,CAAC;IACvB,IAAI,IAAA,qCAAmB,EAAC,MAAM,CAAC,EAAE,CAAC;QAChC,MAAM,EAAE,sBAAsB,EAAE,GAAG,2CACjC,6BAA6B,EAC9B,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,EAAmC,CAAC;QACnE,QAAQ,GAAG,CAAC,MAAM,sBAAsB,CAAC,MAAM,CAAC,CAAa,CAAC;IAChE,CAAC;SAAM,CAAC;QACN,QAAQ,GAAG,IAAA,8BAAmB,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC;YACpC,MAAM,EAAE,wBAAwB;YAChC,MAAM,EAAE,CAAC,IAAA,uBAAU,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC;SACtC,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,EAGpB,CAAC;QACF,KAAK,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9D,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC;YACnC,MAAM,gBAAgB,GAAG,EAAwB,CAAC;YAClD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;gBACzD,gBAAgB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YAChC,CAAC;YACD,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,gBAAgB,CAAC;QACnD,CAAC;QACD,OAAO,CACL,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,YAAY,CAC1D,CAAC;IACb,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,IAAI,sCAAsC,CAAC,IAAI,CAAE,KAAe,CAAC,OAAO,CAAC,EAAE,CAAC;YAC1E,OAAO;gBACL,OAAO,EAAE,GAAG,MAAM,CAAC,EAAE,mGAAmG;aACzH,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}
|
@@ -0,0 +1,41 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.sendAndConfirmCalls = sendAndConfirmCalls;
|
4
|
+
const send_calls_js_1 = require("./send-calls.js");
|
5
|
+
const wait_for_calls_receipt_js_1 = require("./wait-for-calls-receipt.js");
|
6
|
+
/**
|
7
|
+
* Send and confirm calls in a single transaction.
|
8
|
+
*
|
9
|
+
* This is a convenience function that sends the calls with `sendCalls` and then waits for the receipts with `waitForCallsReceipt`.
|
10
|
+
*
|
11
|
+
* @param options - The options for sending and confirming calls.
|
12
|
+
* @returns The receipts of the calls.
|
13
|
+
* @example
|
14
|
+
* ```ts
|
15
|
+
* const call1 = approve({
|
16
|
+
* contract: USDT_CONTRACT,
|
17
|
+
* amount: 100,
|
18
|
+
* spender: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
|
19
|
+
* });
|
20
|
+
* const call2 = transfer({
|
21
|
+
* contract: USDT_CONTRACT,
|
22
|
+
* to: "0x2a4f24F935Eb178e3e7BA9B53A5Ee6d8407C0709",
|
23
|
+
* amount: 100,
|
24
|
+
* });
|
25
|
+
* const result = await sendAndConfirmCalls({
|
26
|
+
* calls: [call1, call2],
|
27
|
+
* wallet: wallet,
|
28
|
+
* });
|
29
|
+
* console.log("Transaction receipts:", result.receipts);
|
30
|
+
* ```
|
31
|
+
* @extension EIP5792
|
32
|
+
* @beta
|
33
|
+
*/
|
34
|
+
async function sendAndConfirmCalls(options) {
|
35
|
+
const sendCallsResult = await (0, send_calls_js_1.sendCalls)(options);
|
36
|
+
return (0, wait_for_calls_receipt_js_1.waitForCallsReceipt)({
|
37
|
+
...sendCallsResult,
|
38
|
+
maxBlocksWaitTime: options.maxBlocksWaitTime,
|
39
|
+
});
|
40
|
+
}
|
41
|
+
//# sourceMappingURL=send-and-confirm-calls.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"send-and-confirm-calls.js","sourceRoot":"","sources":["../../../../src/wallets/eip5792/send-and-confirm-calls.ts"],"names":[],"mappings":";;AAiCA,kDAcC;AA9CD,mDAAmE;AAEnE,2EAAkE;AAElE;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACI,KAAK,UAAU,mBAAmB,CACvC,OAMC;IAED,MAAM,eAAe,GAAG,MAAM,IAAA,yBAAS,EAAC,OAAO,CAAC,CAAC;IACjD,OAAO,IAAA,+CAAmB,EAAC;QACzB,GAAG,eAAe;QAClB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;KAC7C,CAAC,CAAC;AACL,CAAC"}
|
@@ -4,6 +4,7 @@ exports.sendCalls = sendCalls;
|
|
4
4
|
const encode_js_1 = require("../../transaction/actions/encode.js");
|
5
5
|
const address_js_1 = require("../../utils/address.js");
|
6
6
|
const hex_js_1 = require("../../utils/encoding/hex.js");
|
7
|
+
const json_js_1 = require("../../utils/json.js");
|
7
8
|
const resolve_promised_value_js_1 = require("../../utils/promise/resolve-promised-value.js");
|
8
9
|
const coinbase_web_js_1 = require("../coinbase/coinbase-web.js");
|
9
10
|
const index_js_1 = require("../in-app/core/wallet/index.js");
|
@@ -36,6 +37,7 @@ const controller_js_1 = require("../wallet-connect/controller.js");
|
|
36
37
|
*
|
37
38
|
* const client = createThirdwebClient({ clientId: ... });
|
38
39
|
* const wallet = createWallet("com.coinbase.wallet");
|
40
|
+
* await wallet.connect({ client });
|
39
41
|
*
|
40
42
|
* const sendTx1 = approve({
|
41
43
|
contract: USDT_CONTRACT,
|
@@ -65,12 +67,13 @@ const controller_js_1 = require("../wallet-connect/controller.js");
|
|
65
67
|
* }
|
66
68
|
* }
|
67
69
|
* });
|
68
|
-
* We recommend proxying any paymaster calls via an API route you setup and control.
|
69
70
|
* ```
|
71
|
+
* We recommend proxying any paymaster calls via an API route you setup and control.
|
72
|
+
*
|
70
73
|
* @extension EIP5792
|
71
74
|
*/
|
72
75
|
async function sendCalls(options) {
|
73
|
-
const { wallet, calls, capabilities, version = "
|
76
|
+
const { wallet, calls, capabilities, version = "2.0.0", chain = wallet.getChain(), } = options;
|
74
77
|
if (!chain) {
|
75
78
|
throw new Error(`Cannot send calls, no active chain found for wallet: ${wallet.id}`);
|
76
79
|
}
|
@@ -78,10 +81,16 @@ async function sendCalls(options) {
|
|
78
81
|
if (!account) {
|
79
82
|
throw new Error(`Cannot send calls, no account connected for wallet: ${wallet.id}`);
|
80
83
|
}
|
84
|
+
const firstCall = options.calls[0];
|
85
|
+
if (!firstCall) {
|
86
|
+
throw new Error("No calls to send");
|
87
|
+
}
|
88
|
+
const client = firstCall.client;
|
81
89
|
// These conveniently operate the same
|
82
90
|
if ((0, index_js_3.isSmartWallet)(wallet) || (0, index_js_1.isInAppWallet)(wallet)) {
|
83
91
|
const { inAppWalletSendCalls } = await Promise.resolve().then(() => require("../in-app/core/eip5972/in-app-wallet-calls.js"));
|
84
|
-
|
92
|
+
const id = await inAppWalletSendCalls({ account, calls });
|
93
|
+
return { id, client, chain, wallet };
|
85
94
|
}
|
86
95
|
const preparedCalls = await Promise.all(calls.map(async (call) => {
|
87
96
|
const { to, value } = call;
|
@@ -112,27 +121,31 @@ async function sendCalls(options) {
|
|
112
121
|
atomicRequired: options.atomicRequired ?? false,
|
113
122
|
},
|
114
123
|
];
|
115
|
-
if ((0, coinbase_web_js_1.isCoinbaseSDKWallet)(wallet)) {
|
116
|
-
const { coinbaseSDKWalletSendCalls } = await Promise.resolve().then(() => require("../coinbase/coinbase-web.js"));
|
117
|
-
return coinbaseSDKWalletSendCalls({
|
118
|
-
wallet,
|
119
|
-
params: injectedWalletCallParams,
|
120
|
-
});
|
121
|
-
}
|
122
124
|
if ((0, controller_js_1.isWalletConnect)(wallet)) {
|
123
125
|
throw new Error("sendCalls is not yet supported for Wallet Connect");
|
124
126
|
}
|
125
|
-
|
126
|
-
|
127
|
+
let provider;
|
128
|
+
if ((0, coinbase_web_js_1.isCoinbaseSDKWallet)(wallet)) {
|
129
|
+
const { getCoinbaseWebProvider } = await Promise.resolve().then(() => require("../coinbase/coinbase-web.js"));
|
130
|
+
const config = wallet.getConfig();
|
131
|
+
provider = (await getCoinbaseWebProvider(config));
|
132
|
+
}
|
133
|
+
else {
|
134
|
+
provider = (0, index_js_2.getInjectedProvider)(wallet.id);
|
135
|
+
}
|
127
136
|
try {
|
128
|
-
|
137
|
+
const callId = await provider.request({
|
129
138
|
method: "wallet_sendCalls",
|
130
139
|
params: injectedWalletCallParams, // The viem type definition is slightly different
|
131
140
|
});
|
141
|
+
if (typeof callId === "object" && "id" in callId) {
|
142
|
+
return { id: callId.id, client, chain, wallet };
|
143
|
+
}
|
144
|
+
return { id: callId, client, chain, wallet };
|
132
145
|
}
|
133
146
|
catch (error) {
|
134
147
|
if (/unsupport|not support/i.test(error.message)) {
|
135
|
-
throw new Error(`${wallet.id}
|
148
|
+
throw new Error(`${wallet.id} errored calling wallet_sendCalls, with error: ${error instanceof Error ? error.message : (0, json_js_1.stringify)(error)}`);
|
136
149
|
}
|
137
150
|
throw error;
|
138
151
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"send-calls.js","sourceRoot":"","sources":["../../../../src/wallets/eip5792/send-calls.ts"],"names":[],"mappings":";;
|
1
|
+
{"version":3,"file":"send-calls.js","sourceRoot":"","sources":["../../../../src/wallets/eip5792/send-calls.ts"],"names":[],"mappings":";;AAgIA,8BA2GC;AAvOD,mEAA6D;AAE7D,uDAAkE;AAClE,wDAAoE;AACpE,iDAAgD;AAChD,6FAGuD;AAEvD,iEAGqC;AACrC,6DAA+D;AAC/D,mDAA2D;AAG3D,gDAAkD;AAClD,mEAAkE;AA4ClE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4DG;AACI,KAAK,UAAU,SAAS,CAC7B,OAA6B;IAE7B,MAAM,EACJ,MAAM,EACN,KAAK,EACL,YAAY,EACZ,OAAO,GAAG,OAAO,EACjB,KAAK,GAAG,MAAM,CAAC,QAAQ,EAAE,GAC1B,GAAG,OAAO,CAAC;IAEZ,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CACb,wDAAwD,MAAM,CAAC,EAAE,EAAE,CACpE,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;IACpC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CACb,uDAAuD,MAAM,CAAC,EAAE,EAAE,CACnE,CAAC;IACJ,CAAC;IAED,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACnC,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACtC,CAAC;IACD,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IAEhC,sCAAsC;IACtC,IAAI,IAAA,wBAAa,EAAC,MAAM,CAAC,IAAI,IAAA,wBAAa,EAAC,MAAM,CAAC,EAAE,CAAC;QACnD,MAAM,EAAE,oBAAoB,EAAE,GAAG,2CAC/B,+CAA+C,EAChD,CAAC;QACF,MAAM,EAAE,GAAG,MAAM,oBAAoB,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1D,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IACvC,CAAC;IAED,MAAM,aAAa,GAAkB,MAAM,OAAO,CAAC,GAAG,CACpD,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACvB,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QAC3B,IAAI,EAAE,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAChD,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;QACxE,CAAC;QAED,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC7C,IAAA,gDAAoB,EAAC,EAAE,CAAC;YACxB,IAAA,kBAAM,EAAC,IAAI,CAAC;YACZ,IAAA,gDAAoB,EAAC,KAAK,CAAC;SAC5B,CAAC,CAAC;QAEH,OAAO;YACL,EAAE,EAAE,GAAc;YAClB,IAAI,EAAE,KAAY;YAClB,KAAK,EACH,OAAO,MAAM,KAAK,QAAQ,IAAI,OAAO,MAAM,KAAK,QAAQ;gBACtD,CAAC,CAAC,IAAA,oBAAW,EAAC,MAAM,CAAC;gBACrB,CAAC,CAAC,SAAS;SAChB,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;IAEF,MAAM,wBAAwB,GAA8B;QAC1D;YACE,IAAI,EAAE,IAAA,uBAAU,EAAC,OAAO,CAAC,OAAO,CAAC;YACjC,KAAK,EAAE,aAAa;YACpB,YAAY;YACZ,OAAO;YACP,OAAO,EAAE,IAAA,oBAAW,EAAC,KAAK,CAAC,EAAE,CAAC;YAC9B,gEAAgE;YAChE,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,KAAK;SAChD;KACF,CAAC;IAEF,IAAI,IAAA,+BAAe,EAAC,MAAM,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;IAED,IAAI,QAAkB,CAAC;IACvB,IAAI,IAAA,qCAAmB,EAAC,MAAM,CAAC,EAAE,CAAC;QAChC,MAAM,EAAE,sBAAsB,EAAE,GAAG,2CACjC,6BAA6B,EAC9B,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,EAAmC,CAAC;QACnE,QAAQ,GAAG,CAAC,MAAM,sBAAsB,CAAC,MAAM,CAAC,CAAa,CAAC;IAChE,CAAC;SAAM,CAAC;QACN,QAAQ,GAAG,IAAA,8BAAmB,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC;YACpC,MAAM,EAAE,kBAAkB;YAC1B,MAAM,EAAE,wBAAyD,EAAE,iDAAiD;SACrH,CAAC,CAAC;QACH,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,IAAI,IAAI,MAAM,EAAE,CAAC;YACjD,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QAClD,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAC/C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,wBAAwB,CAAC,IAAI,CAAE,KAAe,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5D,MAAM,IAAI,KAAK,CACb,GAAG,MAAM,CAAC,EAAE,kDAAkD,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,mBAAS,EAAC,KAAK,CAAC,EAAE,CAC1H,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}
|
@@ -30,23 +30,24 @@ const controller_js_1 = require("../wallet-connect/controller.js");
|
|
30
30
|
* @extension EIP5792
|
31
31
|
* @internal
|
32
32
|
*/
|
33
|
-
async function showCallsStatus({ wallet,
|
33
|
+
async function showCallsStatus({ wallet, id, }) {
|
34
34
|
if ((0, index_js_3.isSmartWallet)(wallet) ||
|
35
35
|
(0, index_js_1.isInAppWallet)(wallet) ||
|
36
36
|
(0, controller_js_1.isWalletConnect)(wallet)) {
|
37
37
|
throw new Error("showCallsStatus is currently unsupported for this wallet type");
|
38
38
|
}
|
39
|
+
let provider;
|
39
40
|
if ((0, coinbase_web_js_1.isCoinbaseSDKWallet)(wallet)) {
|
40
|
-
|
41
|
-
|
42
|
-
|
41
|
+
provider = (await (0, coinbase_web_js_1.getCoinbaseWebProvider)(wallet.getConfig()));
|
42
|
+
}
|
43
|
+
else {
|
44
|
+
// Default to injected wallet
|
45
|
+
provider = (0, index_js_2.getInjectedProvider)(wallet.id);
|
43
46
|
}
|
44
|
-
// Default to injected wallet
|
45
|
-
const provider = (0, index_js_2.getInjectedProvider)(wallet.id);
|
46
47
|
try {
|
47
48
|
return await provider.request({
|
48
49
|
method: "wallet_showCallsStatus",
|
49
|
-
params: [
|
50
|
+
params: [id],
|
50
51
|
});
|
51
52
|
}
|
52
53
|
catch (error) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"show-calls-status.js","sourceRoot":"","sources":["../../../../src/wallets/eip5792/show-calls-status.ts"],"names":[],"mappings":";;
|
1
|
+
{"version":3,"file":"show-calls-status.js","sourceRoot":"","sources":["../../../../src/wallets/eip5792/show-calls-status.ts"],"names":[],"mappings":";;AAyCA,0CAmCC;AA5ED,iEAGqC;AACrC,6DAA+D;AAC/D,mDAA2D;AAG3D,gDAAkD;AAClD,mEAAkE;AAQlE;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACI,KAAK,UAAU,eAAe,CAAC,EACpC,MAAM,EACN,EAAE,GACqB;IACvB,IACE,IAAA,wBAAa,EAAC,MAAM,CAAC;QACrB,IAAA,wBAAa,EAAC,MAAM,CAAC;QACrB,IAAA,+BAAe,EAAC,MAAM,CAAC,EACvB,CAAC;QACD,MAAM,IAAI,KAAK,CACb,+DAA+D,CAChE,CAAC;IACJ,CAAC;IAED,IAAI,QAAkB,CAAC;IACvB,IAAI,IAAA,qCAAmB,EAAC,MAAM,CAAC,EAAE,CAAC;QAChC,QAAQ,GAAG,CAAC,MAAM,IAAA,wCAAsB,EAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAa,CAAC;IAC5E,CAAC;SAAM,CAAC;QACN,6BAA6B;QAC7B,QAAQ,GAAG,IAAA,8BAAmB,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,CAAC;QACH,OAAO,MAAM,QAAQ,CAAC,OAAO,CAAC;YAC5B,MAAM,EAAE,wBAAwB;YAChC,MAAM,EAAE,CAAC,EAAE,CAAC;SACb,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,IAAI,wBAAwB,CAAC,IAAI,CAAE,KAAe,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5D,MAAM,IAAI,KAAK,CACb,GAAG,MAAM,CAAC,EAAE,mGAAmG,CAChH,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.
|
3
|
+
exports.waitForCallsReceipt = waitForCallsReceipt;
|
4
4
|
const watchBlockNumber_js_1 = require("../../rpc/watchBlockNumber.js");
|
5
5
|
const get_calls_status_js_1 = require("./get-calls-status.js");
|
6
6
|
const DEFAULT_MAX_BLOCKS_WAIT_TIME = 100;
|
@@ -17,20 +17,32 @@ const map = new Map();
|
|
17
17
|
* @beta
|
18
18
|
* @example
|
19
19
|
* ```ts
|
20
|
-
* import {
|
21
|
-
* const result = await
|
20
|
+
* import { waitForCallsReceipt } from "thirdweb/wallets/eip5792";
|
21
|
+
* const result = await waitForCallsReceipt({
|
22
22
|
* client,
|
23
23
|
* chain,
|
24
24
|
* wallet,
|
25
|
-
*
|
25
|
+
* id: "0x123...",
|
26
26
|
* });
|
27
27
|
* ```
|
28
|
+
*
|
29
|
+
* Example with useSendCalls:
|
30
|
+
* ```ts
|
31
|
+
* const sendResult = await sendCalls({
|
32
|
+
* client,
|
33
|
+
* chain,
|
34
|
+
* wallet,
|
35
|
+
* calls: [...],
|
36
|
+
* });
|
37
|
+
* const confirmResult = await waitForCallsReceipt(sendResult);
|
38
|
+
* console.log("Transaction confirmed: ", confirmResult.receipts?.[0].transactionHash);
|
39
|
+
* ```
|
28
40
|
* @extension EIP5792
|
29
41
|
*/
|
30
|
-
function
|
31
|
-
const {
|
42
|
+
function waitForCallsReceipt(options) {
|
43
|
+
const { id, chain, wallet, client } = options;
|
32
44
|
const chainId = chain.id;
|
33
|
-
const key = `${chainId}:calls_${
|
45
|
+
const key = `${chainId}:calls_${id}`;
|
34
46
|
const maxBlocksWaitTime = options.maxBlocksWaitTime ?? DEFAULT_MAX_BLOCKS_WAIT_TIME;
|
35
47
|
if (map.has(key)) {
|
36
48
|
// biome-ignore lint/style/noNonNullAssertion: the `has` above ensures that this will always be set
|
@@ -53,13 +65,14 @@ function waitForBundle(options) {
|
|
53
65
|
const result = await (0, get_calls_status_js_1.getCallsStatus)({
|
54
66
|
wallet,
|
55
67
|
client,
|
56
|
-
|
68
|
+
id,
|
57
69
|
});
|
58
|
-
if (result.status === "
|
70
|
+
if (result.status === "success" || result.status === "failure") {
|
59
71
|
// stop the polling
|
60
72
|
unwatch();
|
61
73
|
// resolve the top level promise with the result
|
62
74
|
resolve(result);
|
75
|
+
return;
|
63
76
|
}
|
64
77
|
}
|
65
78
|
catch {
|
@@ -74,4 +87,4 @@ function waitForBundle(options) {
|
|
74
87
|
map.set(key, promise);
|
75
88
|
return promise;
|
76
89
|
}
|
77
|
-
//# sourceMappingURL=wait-for-
|
90
|
+
//# sourceMappingURL=wait-for-calls-receipt.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"wait-for-calls-receipt.js","sourceRoot":"","sources":["../../../../src/wallets/eip5792/wait-for-calls-receipt.ts"],"names":[],"mappings":";;AAoDA,kDAuDC;AAzGD,uEAAiE;AAGjE,+DAAuD;AAEvD,MAAM,4BAA4B,GAAG,GAAG,CAAC;AAEzC,MAAM,GAAG,GAAG,IAAI,GAAG,EAA2C,CAAC;AAS/D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,SAAgB,mBAAmB,CACjC,OAAmC;IAEnC,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAE9C,MAAM,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC;IACzB,MAAM,GAAG,GAAG,GAAG,OAAO,UAAU,EAAE,EAAE,CAAC;IACrC,MAAM,iBAAiB,GACrB,OAAO,CAAC,iBAAiB,IAAI,4BAA4B,CAAC;IAE5D,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QACjB,mGAAmG;QACnG,OAAO,GAAG,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;IACvB,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACtE,oDAAoD;QACpD,IAAI,YAAY,GAAG,CAAC,CAAC,CAAC;QAEtB,MAAM,OAAO,GAAG,IAAA,sCAAgB,EAAC;YAC/B,MAAM,EAAE,MAAM;YACd,KAAK,EAAE,KAAK;YACZ,gBAAgB,EAAE,KAAK,IAAI,EAAE;gBAC3B,YAAY,EAAE,CAAC;gBACf,IAAI,YAAY,IAAI,iBAAiB,EAAE,CAAC;oBACtC,OAAO,EAAE,CAAC;oBACV,MAAM,CACJ,IAAI,KAAK,CAAC,8BAA8B,iBAAiB,SAAS,CAAC,CACpE,CAAC;oBACF,OAAO;gBACT,CAAC;gBACD,IAAI,CAAC;oBACH,MAAM,MAAM,GAAG,MAAM,IAAA,oCAAc,EAAC;wBAClC,MAAM;wBACN,MAAM;wBACN,EAAE;qBACH,CAAC,CAAC;oBACH,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;wBAC/D,mBAAmB;wBACnB,OAAO,EAAE,CAAC;wBACV,gDAAgD;wBAChD,OAAO,CAAC,MAAM,CAAC,CAAC;wBAChB,OAAO;oBACT,CAAC;gBACH,CAAC;gBAAC,MAAM,CAAC;oBACP,2CAA2C;gBAC7C,CAAC;YACH,CAAC;SACF,CAAC,CAAC;QACH,wEAAwE;IAC1E,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;QACd,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACtB,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
@@ -15,15 +15,15 @@ const bundlesToTransactions = new lru_js_1.LruMap(1000);
|
|
15
15
|
async function inAppWalletSendCalls(args) {
|
16
16
|
const { account, calls } = args;
|
17
17
|
const hashes = [];
|
18
|
-
const
|
19
|
-
bundlesToTransactions.set(
|
18
|
+
const id = (0, random_js_1.randomBytesHex)(65);
|
19
|
+
bundlesToTransactions.set(id, hashes);
|
20
20
|
if (account.sendBatchTransaction) {
|
21
21
|
const receipt = await (0, send_batch_transaction_js_1.sendBatchTransaction)({
|
22
22
|
account,
|
23
23
|
transactions: calls,
|
24
24
|
});
|
25
25
|
hashes.push(receipt.transactionHash);
|
26
|
-
bundlesToTransactions.set(
|
26
|
+
bundlesToTransactions.set(id, hashes);
|
27
27
|
}
|
28
28
|
else {
|
29
29
|
for (const tx of calls) {
|
@@ -32,26 +32,26 @@ async function inAppWalletSendCalls(args) {
|
|
32
32
|
transaction: tx,
|
33
33
|
});
|
34
34
|
hashes.push(receipt.transactionHash);
|
35
|
-
bundlesToTransactions.set(
|
35
|
+
bundlesToTransactions.set(id, hashes);
|
36
36
|
}
|
37
37
|
}
|
38
|
-
return
|
38
|
+
return id;
|
39
39
|
}
|
40
40
|
/**
|
41
41
|
* @internal
|
42
42
|
*/
|
43
43
|
async function inAppWalletGetCallsStatus(args) {
|
44
|
-
const { wallet, client,
|
44
|
+
const { wallet, client, id } = args;
|
45
45
|
const chain = wallet.getChain();
|
46
46
|
if (!chain) {
|
47
47
|
throw new Error("Failed to get calls status, no active chain found");
|
48
48
|
}
|
49
|
-
const bundle = bundlesToTransactions.get(
|
49
|
+
const bundle = bundlesToTransactions.get(id);
|
50
50
|
if (!bundle) {
|
51
51
|
throw new Error("Failed to get calls status, unknown bundle id");
|
52
52
|
}
|
53
53
|
const request = (0, rpc_js_1.getRpcClient)({ client, chain });
|
54
|
-
let status = "
|
54
|
+
let status = "success";
|
55
55
|
const receipts = await Promise.all(bundle.map((hash) => (0, eth_getTransactionReceipt_js_1.eth_getTransactionReceipt)(request, { hash })
|
56
56
|
.then((receipt) => ({
|
57
57
|
logs: receipt.logs.map((l) => ({
|
@@ -66,12 +66,17 @@ async function inAppWalletGetCallsStatus(args) {
|
|
66
66
|
transactionHash: receipt.transactionHash,
|
67
67
|
}))
|
68
68
|
.catch(() => {
|
69
|
-
status = "
|
69
|
+
status = "pending";
|
70
70
|
return null; // Return null if there's an error to filter out later
|
71
71
|
})));
|
72
72
|
return {
|
73
73
|
status,
|
74
|
-
|
74
|
+
statusCode: 200,
|
75
|
+
atomic: false,
|
76
|
+
chainId: chain.id,
|
77
|
+
id,
|
78
|
+
version: "2.0.0",
|
79
|
+
receipts: receipts.filter((r) => r !== null),
|
75
80
|
};
|
76
81
|
}
|
77
82
|
//# sourceMappingURL=in-app-wallet-calls.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"in-app-wallet-calls.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/eip5972/in-app-wallet-calls.ts"],"names":[],"mappings":";;
|
1
|
+
{"version":3,"file":"in-app-wallet-calls.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/eip5972/in-app-wallet-calls.ts"],"names":[],"mappings":";;AAoBA,oDA4BC;AAKD,8DAmDC;AAvGD,uGAAiG;AACjG,mDAAsD;AACtD,qHAA4G;AAC5G,yGAAiG;AACjG,6DAA0D;AAE1D,2DAA6D;AAQ7D,MAAM,qBAAqB,GAAG,IAAI,eAAM,CAAQ,IAAI,CAAC,CAAC;AAEtD;;GAEG;AACI,KAAK,UAAU,oBAAoB,CAAC,IAG1C;IACC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAEhC,MAAM,MAAM,GAAU,EAAE,CAAC;IACzB,MAAM,EAAE,GAAG,IAAA,0BAAc,EAAC,EAAE,CAAC,CAAC;IAC9B,qBAAqB,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IACtC,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC;QACjC,MAAM,OAAO,GAAG,MAAM,IAAA,gDAAoB,EAAC;YACzC,OAAO;YACP,YAAY,EAAE,KAAK;SACpB,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QACrC,qBAAqB,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC;SAAM,CAAC;QACN,KAAK,MAAM,EAAE,IAAI,KAAK,EAAE,CAAC;YACvB,MAAM,OAAO,GAAG,MAAM,IAAA,2DAAyB,EAAC;gBAC9C,OAAO;gBACP,WAAW,EAAE,EAAE;aAChB,CAAC,CAAC;YACH,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YACrC,qBAAqB,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,yBAAyB,CAAC,IAI/C;IACC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;IAEpC,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;IAChC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,MAAM,GAAG,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC7C,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;IACnE,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,qBAAY,EAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAChD,IAAI,MAAM,GAAsC,SAAS,CAAC;IAC1D,MAAM,QAAQ,GACZ,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAClB,IAAA,wDAAyB,EAAC,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC;SACzC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAClB,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC7B,OAAO,EAAE,CAAC,CAAC,OAAO;YAClB,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,MAAM,EAAE,CAAC,CAAC,MAAM;SACjB,CAAC,CAAC;QACH,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,eAAe,EAAE,OAAO,CAAC,eAAe;KACzC,CAAC,CAAC;SACF,KAAK,CAAC,GAAG,EAAE;QACV,MAAM,GAAG,SAAS,CAAC;QACnB,OAAO,IAAI,CAAC,CAAC,sDAAsD;IACrE,CAAC,CAAC,CACL,CACF,CAAC;IAEJ,OAAO;QACL,MAAM;QACN,UAAU,EAAE,GAAG;QACf,MAAM,EAAE,KAAK;QACb,OAAO,EAAE,KAAK,CAAC,EAAE;QACjB,EAAE;QACF,OAAO,EAAE,OAAO;QAChB,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC;KAC7C,CAAC;AACJ,CAAC"}
|
@@ -16,14 +16,24 @@ function inAppWalletGetCapabilities(args) {
|
|
16
16
|
const config = wallet.getConfig();
|
17
17
|
const sponsorGas = config?.smartAccount && "sponsorGas" in config.smartAccount
|
18
18
|
? config.smartAccount.sponsorGas
|
19
|
-
:
|
19
|
+
: config?.executionMode
|
20
|
+
? config.executionMode.mode === "EIP4337" &&
|
21
|
+
config.executionMode.smartAccount &&
|
22
|
+
"sponsorGas" in config.executionMode.smartAccount
|
23
|
+
? config.executionMode.smartAccount.sponsorGas
|
24
|
+
: config.executionMode.mode === "EIP7702"
|
25
|
+
? config.executionMode.sponsorGas
|
26
|
+
: false
|
27
|
+
: false;
|
20
28
|
return {
|
21
29
|
[chain.id]: {
|
22
30
|
paymasterService: {
|
23
31
|
supported: sponsorGas,
|
24
32
|
},
|
25
|
-
|
26
|
-
|
33
|
+
atomic: {
|
34
|
+
status: account?.sendBatchTransaction !== undefined
|
35
|
+
? "supported"
|
36
|
+
: "unsupported",
|
27
37
|
},
|
28
38
|
},
|
29
39
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"in-app-wallet-capabilities.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/eip5972/in-app-wallet-capabilities.ts"],"names":[],"mappings":";;AAKA,
|
1
|
+
{"version":3,"file":"in-app-wallet-capabilities.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/eip5972/in-app-wallet-capabilities.ts"],"names":[],"mappings":";;AAKA,gEAyCC;AA5CD;;GAEG;AACH,SAAgB,0BAA0B,CAAC,IAE1C;IACC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAExB,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;IAChC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO;YACL,OAAO,EAAE,6DAA6D,MAAM,CAAC,EAAE,EAAE;SAClF,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;IAEpC,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;IAClC,MAAM,UAAU,GACd,MAAM,EAAE,YAAY,IAAI,YAAY,IAAI,MAAM,CAAC,YAAY;QACzD,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU;QAChC,CAAC,CAAC,MAAM,EAAE,aAAa;YACrB,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,KAAK,SAAS;gBACvC,MAAM,CAAC,aAAa,CAAC,YAAY;gBACjC,YAAY,IAAI,MAAM,CAAC,aAAa,CAAC,YAAY;gBACjD,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,UAAU;gBAC9C,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,KAAK,SAAS;oBACvC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,UAAU;oBACjC,CAAC,CAAC,KAAK;YACX,CAAC,CAAC,KAAK,CAAC;IAEd,OAAO;QACL,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE;YACV,gBAAgB,EAAE;gBAChB,SAAS,EAAE,UAAU;aACtB;YACD,MAAM,EAAE;gBACN,MAAM,EACJ,OAAO,EAAE,oBAAoB,KAAK,SAAS;oBACzC,CAAC,CAAC,WAAW;oBACb,CAAC,CAAC,aAAa;aACpB;SACF;KACF,CAAC;AACJ,CAAC"}
|
@@ -0,0 +1,15 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.isInAppSigner = isInAppSigner;
|
4
|
+
const is_ecosystem_wallet_js_1 = require("../../../../wallets/ecosystem/is-ecosystem-wallet.js");
|
5
|
+
const index_js_1 = require("../../../smart/index.js");
|
6
|
+
const index_js_2 = require("./index.js");
|
7
|
+
function isInAppSigner(options) {
|
8
|
+
const isInAppOrEcosystem = (w) => (0, index_js_2.isInAppWallet)(w) || (0, is_ecosystem_wallet_js_1.isEcosystemWallet)(w);
|
9
|
+
const isSmartWalletWithAdmin = (0, index_js_1.isSmartWallet)(options.wallet) &&
|
10
|
+
options.connectedWallets.some((w) => isInAppOrEcosystem(w) &&
|
11
|
+
w.getAccount()?.address?.toLowerCase() ===
|
12
|
+
options.wallet.getAdminAccount?.()?.address?.toLowerCase());
|
13
|
+
return isInAppOrEcosystem(options.wallet) || isSmartWalletWithAdmin;
|
14
|
+
}
|
15
|
+
//# sourceMappingURL=is-in-app-signer.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"is-in-app-signer.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/wallet/is-in-app-signer.ts"],"names":[],"mappings":";;AAKA,sCAeC;AApBD,iGAAyF;AAEzF,sDAAwD;AACxD,yCAA2C;AAE3C,SAAgB,aAAa,CAAC,OAG7B;IACC,MAAM,kBAAkB,GAAG,CAAC,CAAS,EAAE,EAAE,CACvC,IAAA,wBAAa,EAAC,CAAC,CAAC,IAAI,IAAA,0CAAiB,EAAC,CAAC,CAAC,CAAC;IAC3C,MAAM,sBAAsB,GAC1B,IAAA,wBAAa,EAAC,OAAO,CAAC,MAAM,CAAC;QAC7B,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAC3B,CAAC,CAAC,EAAE,EAAE,CACJ,kBAAkB,CAAC,CAAC,CAAC;YACrB,CAAC,CAAC,UAAU,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE;gBACpC,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,CAC/D,CAAC;IACJ,OAAO,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,sBAAsB,CAAC;AACtE,CAAC"}
|
@@ -19,8 +19,10 @@ function smartWalletGetCapabilities(args) {
|
|
19
19
|
paymasterService: {
|
20
20
|
supported: "sponsorGas" in config ? config.sponsorGas : false,
|
21
21
|
},
|
22
|
-
|
23
|
-
|
22
|
+
atomic: {
|
23
|
+
status: account?.sendBatchTransaction !== undefined
|
24
|
+
? "supported"
|
25
|
+
: "unsupported",
|
24
26
|
},
|
25
27
|
},
|
26
28
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"smart-wallet-capabilities.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/smart-wallet-capabilities.ts"],"names":[],"mappings":";;AAKA,
|
1
|
+
{"version":3,"file":"smart-wallet-capabilities.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/smart-wallet-capabilities.ts"],"names":[],"mappings":";;AAKA,gEA4BC;AA/BD;;GAEG;AACH,SAAgB,0BAA0B,CAAC,IAE1C;IACC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAExB,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;IAChC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO;YACL,OAAO,EAAE,6DAA6D,MAAM,CAAC,EAAE,EAAE;SAClF,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;IAEpC,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC;IACxC,OAAO;QACL,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE;YACV,gBAAgB,EAAE;gBAChB,SAAS,EAAE,YAAY,IAAI,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK;aAC9D;YACD,MAAM,EAAE;gBACN,MAAM,EACJ,OAAO,EAAE,oBAAoB,KAAK,SAAS;oBACzC,CAAC,CAAC,WAAW;oBACb,CAAC,CAAC,aAAa;aACpB;SACF;KACF,CAAC;AACJ,CAAC"}
|