viem 2.29.3 → 2.30.0-jxom-send-calls-fallback-20250514150632
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/CHANGELOG.md +5 -3
- package/_cjs/actions/wallet/getCallsStatus.js +37 -4
- package/_cjs/actions/wallet/getCallsStatus.js.map +1 -1
- package/_cjs/actions/wallet/sendCalls.js +49 -2
- package/_cjs/actions/wallet/sendCalls.js.map +1 -1
- package/_cjs/errors/version.js +1 -1
- package/_cjs/errors/version.js.map +1 -1
- package/_esm/actions/wallet/getCallsStatus.js +37 -4
- package/_esm/actions/wallet/getCallsStatus.js.map +1 -1
- package/_esm/actions/wallet/sendCalls.js +50 -2
- package/_esm/actions/wallet/sendCalls.js.map +1 -1
- package/_esm/errors/version.js +1 -1
- package/_esm/errors/version.js.map +1 -1
- package/_types/actions/wallet/getCallsStatus.d.ts.map +1 -1
- package/_types/actions/wallet/sendCalls.d.ts +1 -0
- package/_types/actions/wallet/sendCalls.d.ts.map +1 -1
- package/_types/errors/version.d.ts +1 -1
- package/_types/errors/version.d.ts.map +1 -1
- package/_types/types/capabilities.d.ts +5 -3
- package/_types/types/capabilities.d.ts.map +1 -1
- package/actions/wallet/getCallsStatus.ts +47 -4
- package/actions/wallet/sendCalls.ts +63 -2
- package/errors/version.ts +1 -1
- package/package.json +1 -1
- package/types/capabilities.ts +5 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
# viem
|
|
2
2
|
|
|
3
|
-
## 2.
|
|
3
|
+
## 2.30.0-jxom-send-calls-fallback-20250514150632
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#3648](https://github.com/wevm/viem/pull/3648) [`69db7860aee19dec44488eeb949768f1bfa1ba63`](https://github.com/wevm/viem/commit/69db7860aee19dec44488eeb949768f1bfa1ba63) Thanks [@jxom](https://github.com/jxom)! - Added support for `sendCalls`, `getCallsStatus`, and `waitForCallsStatus` for wallets that do not support EIP-5792 (falls back to `eth_sendTransaction`).
|
|
4
8
|
|
|
5
9
|
### Patch Changes
|
|
6
10
|
|
|
7
11
|
- [#3639](https://github.com/wevm/viem/pull/3639) [`54d5114f7fbdfa4e866f16d8f1fa5ee851bc9979`](https://github.com/wevm/viem/commit/54d5114f7fbdfa4e866f16d8f1fa5ee851bc9979) Thanks [@izayl](https://github.com/izayl)! - Added `account` parameter to multicall.
|
|
8
12
|
|
|
9
|
-
- [`ba718e23e3e19a064abc35e31234b7759b0d1b6e`](https://github.com/wevm/viem/commit/ba718e23e3e19a064abc35e31234b7759b0d1b6e) Thanks [@jxom](https://github.com/jxom)! - Fixed ERC-7677 `paymasterService` capability types.
|
|
10
|
-
|
|
11
13
|
## 2.29.2
|
|
12
14
|
|
|
13
15
|
### Patch Changes
|
|
@@ -1,13 +1,46 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getCallsStatus = getCallsStatus;
|
|
4
|
+
const slice_js_1 = require("../../utils/data/slice.js");
|
|
5
|
+
const trim_js_1 = require("../../utils/data/trim.js");
|
|
4
6
|
const fromHex_js_1 = require("../../utils/encoding/fromHex.js");
|
|
5
7
|
const transactionReceipt_js_1 = require("../../utils/formatters/transactionReceipt.js");
|
|
8
|
+
const sendCalls_js_1 = require("./sendCalls.js");
|
|
6
9
|
async function getCallsStatus(client, parameters) {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
10
|
+
async function getStatus(id) {
|
|
11
|
+
const isTransactions = id.startsWith(sendCalls_js_1.transactionMagicIdentifier);
|
|
12
|
+
if (isTransactions) {
|
|
13
|
+
const chainId = (0, trim_js_1.trim)((0, slice_js_1.sliceHex)(id, 32, 64));
|
|
14
|
+
const hashes = (0, slice_js_1.sliceHex)(id, 64)
|
|
15
|
+
.slice(2)
|
|
16
|
+
.match(/.{1,64}/g);
|
|
17
|
+
const receipts = await Promise.all(hashes.map((hash) => client.request({
|
|
18
|
+
method: 'eth_getTransactionReceipt',
|
|
19
|
+
params: [`0x${hash}`],
|
|
20
|
+
}, { dedupe: true })));
|
|
21
|
+
const status = (() => {
|
|
22
|
+
if (receipts.some((r) => r === null))
|
|
23
|
+
return 100;
|
|
24
|
+
if (receipts.every((r) => r?.status === '0x1'))
|
|
25
|
+
return 200;
|
|
26
|
+
if (receipts.every((r) => r?.status === '0x0'))
|
|
27
|
+
return 500;
|
|
28
|
+
return 600;
|
|
29
|
+
})();
|
|
30
|
+
return {
|
|
31
|
+
atomic: false,
|
|
32
|
+
chainId: (0, fromHex_js_1.hexToNumber)(chainId),
|
|
33
|
+
receipts: receipts.filter(Boolean),
|
|
34
|
+
status,
|
|
35
|
+
version: '2.0.0',
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
return client.request({
|
|
39
|
+
method: 'wallet_getCallsStatus',
|
|
40
|
+
params: [id],
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
const { atomic = false, chainId, receipts, version = '2.0.0', ...response } = await getStatus(parameters.id);
|
|
11
44
|
const [status, statusCode] = (() => {
|
|
12
45
|
const statusCode = response.status;
|
|
13
46
|
if (statusCode >= 100 && statusCode < 200)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getCallsStatus.js","sourceRoot":"","sources":["../../../actions/wallet/getCallsStatus.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"getCallsStatus.js","sourceRoot":"","sources":["../../../actions/wallet/getCallsStatus.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.transactionMagicIdentifier = void 0;
|
|
3
4
|
exports.sendCalls = sendCalls;
|
|
4
5
|
const parseAccount_js_1 = require("../../accounts/utils/parseAccount.js");
|
|
5
6
|
const account_js_1 = require("../../errors/account.js");
|
|
6
7
|
const encodeFunctionData_js_1 = require("../../utils/abi/encodeFunctionData.js");
|
|
8
|
+
const concat_js_1 = require("../../utils/data/concat.js");
|
|
9
|
+
const fromHex_js_1 = require("../../utils/encoding/fromHex.js");
|
|
7
10
|
const toHex_js_1 = require("../../utils/encoding/toHex.js");
|
|
8
11
|
const getTransactionError_js_1 = require("../../utils/errors/getTransactionError.js");
|
|
12
|
+
const sendTransaction_js_1 = require("./sendTransaction.js");
|
|
13
|
+
exports.transactionMagicIdentifier = '0x0000000000000000000000000000000000000000000000000000000000000000';
|
|
9
14
|
async function sendCalls(client, parameters) {
|
|
10
|
-
const { account: account_ = client.account,
|
|
15
|
+
const { account: account_ = client.account, chain = client.chain, forceAtomic = false, id, version = '2.0.0', } = parameters;
|
|
11
16
|
if (typeof account_ === 'undefined')
|
|
12
17
|
throw new account_js_1.AccountNotFoundError({
|
|
13
18
|
docsPath: '/docs/actions/wallet/sendCalls',
|
|
@@ -35,7 +40,7 @@ async function sendCalls(client, parameters) {
|
|
|
35
40
|
{
|
|
36
41
|
atomicRequired: forceAtomic,
|
|
37
42
|
calls,
|
|
38
|
-
capabilities,
|
|
43
|
+
capabilities: formatRequestCapabilities(parameters.capabilities),
|
|
39
44
|
chainId: (0, toHex_js_1.numberToHex)(chain.id),
|
|
40
45
|
from: account?.address,
|
|
41
46
|
id,
|
|
@@ -48,6 +53,32 @@ async function sendCalls(client, parameters) {
|
|
|
48
53
|
return response;
|
|
49
54
|
}
|
|
50
55
|
catch (err) {
|
|
56
|
+
const error = err;
|
|
57
|
+
if (error.name === 'MethodNotFoundRpcError' ||
|
|
58
|
+
error.name === 'MethodNotSupportedRpcError' ||
|
|
59
|
+
error.details.toLowerCase().includes('does not exist') ||
|
|
60
|
+
error.details.toLowerCase().includes('missing or invalid')) {
|
|
61
|
+
const promises = [];
|
|
62
|
+
for (const call of calls) {
|
|
63
|
+
const promise = (0, sendTransaction_js_1.sendTransaction)(client, {
|
|
64
|
+
account,
|
|
65
|
+
chain,
|
|
66
|
+
data: call.data,
|
|
67
|
+
to: call.to,
|
|
68
|
+
value: call.value ? (0, fromHex_js_1.hexToBigInt)(call.value) : undefined,
|
|
69
|
+
});
|
|
70
|
+
promises.push(promise);
|
|
71
|
+
await new Promise((resolve) => setTimeout(resolve, 32));
|
|
72
|
+
}
|
|
73
|
+
const hashes = await Promise.all(promises);
|
|
74
|
+
return {
|
|
75
|
+
id: (0, concat_js_1.concat)([
|
|
76
|
+
exports.transactionMagicIdentifier,
|
|
77
|
+
(0, toHex_js_1.numberToHex)(chain.id, { size: 32 }),
|
|
78
|
+
...hashes,
|
|
79
|
+
]),
|
|
80
|
+
};
|
|
81
|
+
}
|
|
51
82
|
throw (0, getTransactionError_js_1.getTransactionError)(err, {
|
|
52
83
|
...parameters,
|
|
53
84
|
account,
|
|
@@ -55,4 +86,20 @@ async function sendCalls(client, parameters) {
|
|
|
55
86
|
});
|
|
56
87
|
}
|
|
57
88
|
}
|
|
89
|
+
function formatRequestCapabilities(capabilities) {
|
|
90
|
+
const paymasterService = capabilities?.paymasterService
|
|
91
|
+
? Object.entries(capabilities.paymasterService).reduce((paymasterService, [chainId, value]) => ({
|
|
92
|
+
...(paymasterService ?? {}),
|
|
93
|
+
[(0, toHex_js_1.numberToHex)(Number(chainId))]: value,
|
|
94
|
+
}), {})
|
|
95
|
+
: undefined;
|
|
96
|
+
return {
|
|
97
|
+
...capabilities,
|
|
98
|
+
...(paymasterService
|
|
99
|
+
? {
|
|
100
|
+
paymasterService,
|
|
101
|
+
}
|
|
102
|
+
: {}),
|
|
103
|
+
};
|
|
104
|
+
}
|
|
58
105
|
//# sourceMappingURL=sendCalls.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sendCalls.js","sourceRoot":"","sources":["../../../actions/wallet/sendCalls.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sendCalls.js","sourceRoot":"","sources":["../../../actions/wallet/sendCalls.ts"],"names":[],"mappings":";;;AAgFA,8BAoGC;AAnLD,0EAAmE;AAGnE,wDAA8D;AAU9D,iFAA0E;AAE1E,0DAAmD;AACnD,gEAA6D;AAC7D,4DAA2D;AAC3D,sFAA+E;AAC/E,6DAAsD;AAEzC,QAAA,0BAA0B,GACrC,oEAAoE,CAAA;AAyD/D,KAAK,UAAU,SAAS,CAM7B,MAAyC,EACzC,UAAqE;IAErE,MAAM,EACJ,OAAO,EAAE,QAAQ,GAAG,MAAM,CAAC,OAAO,EAClC,KAAK,GAAG,MAAM,CAAC,KAAK,EACpB,WAAW,GAAG,KAAK,EACnB,EAAE,EACF,OAAO,GAAG,OAAO,GAClB,GAAG,UAAU,CAAA;IAEd,IAAI,OAAO,QAAQ,KAAK,WAAW;QACjC,MAAM,IAAI,iCAAoB,CAAC;YAC7B,QAAQ,EAAE,gCAAgC;SAC3C,CAAC,CAAA;IACJ,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAA,8BAAY,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IAExD,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAc,EAAE,EAAE;QACpD,MAAM,IAAI,GAAG,KAAa,CAAA;QAE1B,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG;YACnB,CAAC,CAAC,IAAA,0CAAkB,EAAC;gBACjB,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,IAAI,EAAE,IAAI,CAAC,IAAI;aAChB,CAAC;YACJ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;QAEb,OAAO;YACL,IAAI;YACJ,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAA,sBAAW,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;SACxD,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CACnC;YACE,MAAM,EAAE,kBAAkB;YAC1B,MAAM,EAAE;gBACN;oBACE,cAAc,EAAE,WAAW;oBAC3B,KAAK;oBACL,YAAY,EAAE,yBAAyB,CAAC,UAAU,CAAC,YAAY,CAAC;oBAChE,OAAO,EAAE,IAAA,sBAAW,EAAC,KAAM,CAAC,EAAE,CAAC;oBAC/B,IAAI,EAAE,OAAO,EAAE,OAAO;oBACtB,EAAE;oBACF,OAAO;iBACR;aACF;SACF,EACD,EAAE,UAAU,EAAE,CAAC,EAAE,CAClB,CAAA;QACD,IAAI,OAAO,QAAQ,KAAK,QAAQ;YAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAA;QACzD,OAAO,QAAiB,CAAA;IAC1B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,KAAK,GAAG,GAAgB,CAAA;QAI9B,IACE,KAAK,CAAC,IAAI,KAAK,wBAAwB;YACvC,KAAK,CAAC,IAAI,KAAK,4BAA4B;YAC3C,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YACtD,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAC1D,CAAC;YACD,MAAM,QAAQ,GAAmB,EAAE,CAAA;YACnC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,MAAM,OAAO,GAAG,IAAA,oCAAe,EAAC,MAAM,EAAE;oBACtC,OAAO;oBACP,KAAK;oBACL,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,EAAE,EAAE,IAAI,CAAC,EAAE;oBACX,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAA,wBAAW,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;iBACxD,CAAC,CAAA;gBACF,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBACtB,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAA;YACzD,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;YAC1C,OAAO;gBACL,EAAE,EAAE,IAAA,kBAAM,EAAC;oBACT,kCAA0B;oBAC1B,IAAA,sBAAW,EAAC,KAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;oBACpC,GAAG,MAAM;iBACV,CAAC;aACH,CAAA;QACH,CAAC;QAED,MAAM,IAAA,4CAAmB,EAAC,GAAgB,EAAE;YAC1C,GAAG,UAAU;YACb,OAAO;YACP,KAAK,EAAE,UAAU,CAAC,KAAM;SACzB,CAAC,CAAA;IACJ,CAAC;AACH,CAAC;AAED,SAAS,yBAAyB,CAChC,YAAqE;IAErE,MAAM,gBAAgB,GAAG,YAAY,EAAE,gBAAgB;QACrD,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAClD,CAAC,gBAAgB,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;YACvC,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC;YAC3B,CAAC,IAAA,sBAAW,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK;SACtC,CAAC,EACF,EAAE,CACH;QACH,CAAC,CAAC,SAAS,CAAA;IAEb,OAAO;QACL,GAAG,YAAY;QACf,GAAG,CAAC,gBAAgB;YAClB,CAAC,CAAC;gBACE,gBAAgB;aACjB;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAA;AACH,CAAC"}
|
package/_cjs/errors/version.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../errors/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../errors/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,OAAO,GAAG,gDAAgD,CAAA"}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
|
+
import { sliceHex } from '../../utils/data/slice.js';
|
|
2
|
+
import { trim } from '../../utils/data/trim.js';
|
|
1
3
|
import { hexToBigInt, hexToNumber } from '../../utils/encoding/fromHex.js';
|
|
2
4
|
import { receiptStatuses } from '../../utils/formatters/transactionReceipt.js';
|
|
5
|
+
import { transactionMagicIdentifier } from './sendCalls.js';
|
|
3
6
|
/**
|
|
4
7
|
* Returns the status of a call batch that was sent via `sendCalls`.
|
|
5
8
|
*
|
|
@@ -21,10 +24,40 @@ import { receiptStatuses } from '../../utils/formatters/transactionReceipt.js';
|
|
|
21
24
|
* const { receipts, status } = await getCallsStatus(client, { id: '0xdeadbeef' })
|
|
22
25
|
*/
|
|
23
26
|
export async function getCallsStatus(client, parameters) {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
27
|
+
async function getStatus(id) {
|
|
28
|
+
const isTransactions = id.startsWith(transactionMagicIdentifier);
|
|
29
|
+
if (isTransactions) {
|
|
30
|
+
const chainId = trim(sliceHex(id, 32, 64));
|
|
31
|
+
const hashes = sliceHex(id, 64)
|
|
32
|
+
.slice(2)
|
|
33
|
+
.match(/.{1,64}/g);
|
|
34
|
+
const receipts = await Promise.all(hashes.map((hash) => client.request({
|
|
35
|
+
method: 'eth_getTransactionReceipt',
|
|
36
|
+
params: [`0x${hash}`],
|
|
37
|
+
}, { dedupe: true })));
|
|
38
|
+
const status = (() => {
|
|
39
|
+
if (receipts.some((r) => r === null))
|
|
40
|
+
return 100; // pending
|
|
41
|
+
if (receipts.every((r) => r?.status === '0x1'))
|
|
42
|
+
return 200; // success
|
|
43
|
+
if (receipts.every((r) => r?.status === '0x0'))
|
|
44
|
+
return 500; // complete failure
|
|
45
|
+
return 600; // partial failure
|
|
46
|
+
})();
|
|
47
|
+
return {
|
|
48
|
+
atomic: false,
|
|
49
|
+
chainId: hexToNumber(chainId),
|
|
50
|
+
receipts: receipts.filter(Boolean),
|
|
51
|
+
status,
|
|
52
|
+
version: '2.0.0',
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
return client.request({
|
|
56
|
+
method: 'wallet_getCallsStatus',
|
|
57
|
+
params: [id],
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
const { atomic = false, chainId, receipts, version = '2.0.0', ...response } = await getStatus(parameters.id);
|
|
28
61
|
const [status, statusCode] = (() => {
|
|
29
62
|
const statusCode = response.status;
|
|
30
63
|
if (statusCode >= 100 && statusCode < 200)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getCallsStatus.js","sourceRoot":"","sources":["../../../actions/wallet/getCallsStatus.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getCallsStatus.js","sourceRoot":"","sources":["../../../actions/wallet/getCallsStatus.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
import { parseAccount } from '../../accounts/utils/parseAccount.js';
|
|
2
2
|
import { AccountNotFoundError } from '../../errors/account.js';
|
|
3
3
|
import { encodeFunctionData } from '../../utils/abi/encodeFunctionData.js';
|
|
4
|
+
import { concat } from '../../utils/data/concat.js';
|
|
5
|
+
import { hexToBigInt } from '../../utils/encoding/fromHex.js';
|
|
4
6
|
import { numberToHex } from '../../utils/encoding/toHex.js';
|
|
5
7
|
import { getTransactionError } from '../../utils/errors/getTransactionError.js';
|
|
8
|
+
import { sendTransaction } from './sendTransaction.js';
|
|
9
|
+
export const transactionMagicIdentifier = '0x0000000000000000000000000000000000000000000000000000000000000000';
|
|
6
10
|
/**
|
|
7
11
|
* Requests the connected wallet to send a batch of calls.
|
|
8
12
|
*
|
|
@@ -36,7 +40,7 @@ import { getTransactionError } from '../../utils/errors/getTransactionError.js';
|
|
|
36
40
|
* })
|
|
37
41
|
*/
|
|
38
42
|
export async function sendCalls(client, parameters) {
|
|
39
|
-
const { account: account_ = client.account,
|
|
43
|
+
const { account: account_ = client.account, chain = client.chain, forceAtomic = false, id, version = '2.0.0', } = parameters;
|
|
40
44
|
if (typeof account_ === 'undefined')
|
|
41
45
|
throw new AccountNotFoundError({
|
|
42
46
|
docsPath: '/docs/actions/wallet/sendCalls',
|
|
@@ -64,7 +68,7 @@ export async function sendCalls(client, parameters) {
|
|
|
64
68
|
{
|
|
65
69
|
atomicRequired: forceAtomic,
|
|
66
70
|
calls,
|
|
67
|
-
capabilities,
|
|
71
|
+
capabilities: formatRequestCapabilities(parameters.capabilities),
|
|
68
72
|
chainId: numberToHex(chain.id),
|
|
69
73
|
from: account?.address,
|
|
70
74
|
id,
|
|
@@ -77,6 +81,34 @@ export async function sendCalls(client, parameters) {
|
|
|
77
81
|
return response;
|
|
78
82
|
}
|
|
79
83
|
catch (err) {
|
|
84
|
+
const error = err;
|
|
85
|
+
// If the transport does not support EIP-5792, fall back to
|
|
86
|
+
// `eth_sendTransaction`.
|
|
87
|
+
if (error.name === 'MethodNotFoundRpcError' ||
|
|
88
|
+
error.name === 'MethodNotSupportedRpcError' ||
|
|
89
|
+
error.details.toLowerCase().includes('does not exist') ||
|
|
90
|
+
error.details.toLowerCase().includes('missing or invalid')) {
|
|
91
|
+
const promises = [];
|
|
92
|
+
for (const call of calls) {
|
|
93
|
+
const promise = sendTransaction(client, {
|
|
94
|
+
account,
|
|
95
|
+
chain,
|
|
96
|
+
data: call.data,
|
|
97
|
+
to: call.to,
|
|
98
|
+
value: call.value ? hexToBigInt(call.value) : undefined,
|
|
99
|
+
});
|
|
100
|
+
promises.push(promise);
|
|
101
|
+
await new Promise((resolve) => setTimeout(resolve, 32));
|
|
102
|
+
}
|
|
103
|
+
const hashes = await Promise.all(promises);
|
|
104
|
+
return {
|
|
105
|
+
id: concat([
|
|
106
|
+
transactionMagicIdentifier,
|
|
107
|
+
numberToHex(chain.id, { size: 32 }),
|
|
108
|
+
...hashes,
|
|
109
|
+
]),
|
|
110
|
+
};
|
|
111
|
+
}
|
|
80
112
|
throw getTransactionError(err, {
|
|
81
113
|
...parameters,
|
|
82
114
|
account,
|
|
@@ -84,4 +116,20 @@ export async function sendCalls(client, parameters) {
|
|
|
84
116
|
});
|
|
85
117
|
}
|
|
86
118
|
}
|
|
119
|
+
function formatRequestCapabilities(capabilities) {
|
|
120
|
+
const paymasterService = capabilities?.paymasterService
|
|
121
|
+
? Object.entries(capabilities.paymasterService).reduce((paymasterService, [chainId, value]) => ({
|
|
122
|
+
...(paymasterService ?? {}),
|
|
123
|
+
[numberToHex(Number(chainId))]: value,
|
|
124
|
+
}), {})
|
|
125
|
+
: undefined;
|
|
126
|
+
return {
|
|
127
|
+
...capabilities,
|
|
128
|
+
...(paymasterService
|
|
129
|
+
? {
|
|
130
|
+
paymasterService,
|
|
131
|
+
}
|
|
132
|
+
: {}),
|
|
133
|
+
};
|
|
134
|
+
}
|
|
87
135
|
//# sourceMappingURL=sendCalls.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sendCalls.js","sourceRoot":"","sources":["../../../actions/wallet/sendCalls.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAA;AAGnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;
|
|
1
|
+
{"version":3,"file":"sendCalls.js","sourceRoot":"","sources":["../../../actions/wallet/sendCalls.ts"],"names":[],"mappings":"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"}
|
package/_esm/errors/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = '2.
|
|
1
|
+
export const version = '2.30.0-jxom-send-calls-fallback-20250514150632';
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../errors/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../errors/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,gDAAgD,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getCallsStatus.d.ts","sourceRoot":"","sources":["../../../actions/wallet/getCallsStatus.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6CAA6C,CAAA;AAC5E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AACtE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"getCallsStatus.d.ts","sourceRoot":"","sources":["../../../actions/wallet/getCallsStatus.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6CAA6C,CAAA;AAC5E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AACtE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,wBAAwB,CAAA;AAG5E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAOnE,MAAM,MAAM,wBAAwB,GAAG;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,CAAA;AAErD,MAAM,MAAM,wBAAwB,GAAG,QAAQ,CAC7C,IAAI,CACF,8BAA8B,CAC5B,mBAAmB,CAAC,gBAAgB,EAAE,YAAY,CAAC,EACnD,MAAM,EACN,MAAM,EACN,SAAS,GAAG,UAAU,CACvB,EACD,QAAQ,CACT,GAAG;IACF,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAA;CACtD,CACF,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG,gBAAgB,GAAG,SAAS,CAAA;AAElE;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,cAAc,CAClC,KAAK,SAAS,KAAK,GAAG,SAAS,EAC/B,OAAO,SAAS,OAAO,GAAG,SAAS,GAAG,SAAS,EAE/C,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,EACzC,UAAU,EAAE,wBAAwB,GACnC,OAAO,CAAC,wBAAwB,CAAC,CA+EnC"}
|
|
@@ -9,6 +9,7 @@ import type { Chain, DeriveChain } from '../../types/chain.js';
|
|
|
9
9
|
import type { WalletSendCallsParameters } from '../../types/eip1193.js';
|
|
10
10
|
import type { Prettify } from '../../types/utils.js';
|
|
11
11
|
import type { RequestErrorType } from '../../utils/buildRequest.js';
|
|
12
|
+
export declare const transactionMagicIdentifier = "0x0000000000000000000000000000000000000000000000000000000000000000";
|
|
12
13
|
export type SendCallsParameters<chain extends Chain | undefined = Chain | undefined, account extends Account | undefined = Account | undefined, chainOverride extends Chain | undefined = Chain | undefined, calls extends readonly unknown[] = readonly unknown[], _chain extends Chain | undefined = DeriveChain<chain, chainOverride>> = {
|
|
13
14
|
chain?: chainOverride | Chain | undefined;
|
|
14
15
|
calls: Calls<Narrow<calls>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sendCalls.d.ts","sourceRoot":"","sources":["../../../actions/wallet/sendCalls.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAE9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6CAA6C,CAAA;AAG5E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC1E,OAAO,KAAK,EAAQ,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AACtE,OAAO,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"sendCalls.d.ts","sourceRoot":"","sources":["../../../actions/wallet/sendCalls.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAE9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6CAA6C,CAAA;AAG5E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC1E,OAAO,KAAK,EAAQ,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AACtE,OAAO,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAA;AAEvE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAEpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAOnE,eAAO,MAAM,0BAA0B,uEAC+B,CAAA;AAEtE,MAAM,MAAM,mBAAmB,CAC7B,KAAK,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EACnD,OAAO,SAAS,OAAO,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,EACzD,aAAa,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EAC3D,KAAK,SAAS,SAAS,OAAO,EAAE,GAAG,SAAS,OAAO,EAAE,EAErD,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,WAAW,CAAC,KAAK,EAAE,aAAa,CAAC,IAClE;IACF,KAAK,CAAC,EAAE,aAAa,GAAG,KAAK,GAAG,SAAS,CAAA;IACzC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;IAC3B,YAAY,CAAC,EAAE,mBAAmB,CAAC,WAAW,EAAE,SAAS,CAAC,GAAG,SAAS,CAAA;IACtE,WAAW,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IACjC,EAAE,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACvB,OAAO,CAAC,EAAE,yBAAyB,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,GAAG,SAAS,CAAA;CACnE,GAAG,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;AAE/D,MAAM,MAAM,mBAAmB,GAAG,QAAQ,CAAC;IACzC,YAAY,CAAC,EAAE,mBAAmB,CAAC,WAAW,EAAE,YAAY,CAAC,GAAG,SAAS,CAAA;IACzE,EAAE,EAAE,MAAM,CAAA;CACX,CAAC,CAAA;AAEF,MAAM,MAAM,kBAAkB,GAAG,gBAAgB,GAAG,SAAS,CAAA;AAE7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAsB,SAAS,CAC7B,KAAK,CAAC,KAAK,SAAS,SAAS,OAAO,EAAE,EACtC,KAAK,SAAS,KAAK,GAAG,SAAS,EAC/B,OAAO,SAAS,OAAO,GAAG,SAAS,GAAG,SAAS,EAC/C,aAAa,SAAS,KAAK,GAAG,SAAS,GAAG,SAAS,EAEnD,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,EACzC,UAAU,EAAE,mBAAmB,CAAC,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,KAAK,CAAC,GACpE,OAAO,CAAC,mBAAmB,CAAC,CA4F9B"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "2.
|
|
1
|
+
export declare const version = "2.30.0-jxom-send-calls-fallback-20250514150632";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../errors/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../errors/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,mDAAmD,CAAA"}
|
|
@@ -37,9 +37,11 @@ export type DefaultCapabilitiesSchema = {
|
|
|
37
37
|
sendCalls: {
|
|
38
38
|
Request: {
|
|
39
39
|
paymasterService?: {
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
40
|
+
[chainId: number]: {
|
|
41
|
+
context?: Record<string, any> | undefined;
|
|
42
|
+
optional?: boolean | undefined;
|
|
43
|
+
url: string;
|
|
44
|
+
};
|
|
43
45
|
} | undefined;
|
|
44
46
|
};
|
|
45
47
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capabilities.d.ts","sourceRoot":"","sources":["../../types/capabilities.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,kDAAkD,CAAA;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AACpC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AACrD,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAEtD,MAAM,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,oBAAoB,CAAC,CAAA;AAEvE,MAAM,MAAM,yBAAyB,GAAG;IACtC,OAAO,EAAE;QACP,OAAO,EAAE;YACP,sBAAsB,CAAC,EACnB;gBACE,OAAO,EAAE,uBAAuB,CAAA;aACjC,GACD,SAAS,CAAA;YACb,2BAA2B,CAAC,EACxB,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,GACrD,SAAS,CAAA;SACd,CAAA;QACD,UAAU,EAAE;YACV,2BAA2B,CAAC,EACxB;gBACE,OAAO,EAAE,MAAM,CAAA;gBACf,SAAS,EAAE,GAAG,CAAA;aACf,GACD,SAAS,CAAA;YACb,oBAAoB,CAAC,EAAE,SAAS,uBAAuB,EAAE,GAAG,SAAS,CAAA;SACtE,CAAA;KACF,CAAA;IACD,eAAe,EAAE;QACf,UAAU,EAAE;YACV,MAAM,CAAC,EACH;gBACE,MAAM,EAAE,WAAW,GAAG,OAAO,GAAG,aAAa,CAAA;aAC9C,GACD,SAAS,CAAA;YACb,sBAAsB,CAAC,EACnB;gBACE,QAAQ,EAAE,CACN,SAAS,GACT,MAAM,GACN,gBAAgB,GAChB,eAAe,CAClB,EAAE,CAAA;gBACH,SAAS,EAAE,OAAO,CAAA;aACnB,GACD,SAAS,CAAA;YACb,gBAAgB,CAAC,EACb;gBACE,SAAS,EAAE,OAAO,CAAA;aACnB,GACD,SAAS,CAAA;SACd,CAAA;KACF,CAAA;IACD,SAAS,EAAE;QACT,OAAO,EAAE;YACP,gBAAgB,CAAC,EACb;gBACE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"capabilities.d.ts","sourceRoot":"","sources":["../../types/capabilities.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,kDAAkD,CAAA;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AACpC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AACrD,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAEtD,MAAM,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,oBAAoB,CAAC,CAAA;AAEvE,MAAM,MAAM,yBAAyB,GAAG;IACtC,OAAO,EAAE;QACP,OAAO,EAAE;YACP,sBAAsB,CAAC,EACnB;gBACE,OAAO,EAAE,uBAAuB,CAAA;aACjC,GACD,SAAS,CAAA;YACb,2BAA2B,CAAC,EACxB,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,GACrD,SAAS,CAAA;SACd,CAAA;QACD,UAAU,EAAE;YACV,2BAA2B,CAAC,EACxB;gBACE,OAAO,EAAE,MAAM,CAAA;gBACf,SAAS,EAAE,GAAG,CAAA;aACf,GACD,SAAS,CAAA;YACb,oBAAoB,CAAC,EAAE,SAAS,uBAAuB,EAAE,GAAG,SAAS,CAAA;SACtE,CAAA;KACF,CAAA;IACD,eAAe,EAAE;QACf,UAAU,EAAE;YACV,MAAM,CAAC,EACH;gBACE,MAAM,EAAE,WAAW,GAAG,OAAO,GAAG,aAAa,CAAA;aAC9C,GACD,SAAS,CAAA;YACb,sBAAsB,CAAC,EACnB;gBACE,QAAQ,EAAE,CACN,SAAS,GACT,MAAM,GACN,gBAAgB,GAChB,eAAe,CAClB,EAAE,CAAA;gBACH,SAAS,EAAE,OAAO,CAAA;aACnB,GACD,SAAS,CAAA;YACb,gBAAgB,CAAC,EACb;gBACE,SAAS,EAAE,OAAO,CAAA;aACnB,GACD,SAAS,CAAA;SACd,CAAA;KACF,CAAA;IACD,SAAS,EAAE;QACT,OAAO,EAAE;YACP,gBAAgB,CAAC,EACb;gBACE,CAAC,OAAO,EAAE,MAAM,GAAG;oBACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAAA;oBACzC,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;oBAC9B,GAAG,EAAE,MAAM,CAAA;iBACZ,CAAA;aACF,GACD,SAAS,CAAA;SACd,CAAA;KACF,CAAA;CACF,CAAA;AAED,MAAM,MAAM,YAAY,CAAC,YAAY,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,IAAI;IACxE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CACnB,GAAG,YAAY,CAAA;AAEhB,MAAM,MAAM,qBAAqB,CAC/B,YAAY,SAAS,YAAY,GAAG,YAAY,EAChD,EAAE,SAAS,MAAM,GAAG,MAAM,GAAG,GAAG,IAC9B;KACD,OAAO,IAAI,EAAE,GAAG,YAAY;CAC9B,CAAA;AAED,MAAM,MAAM,mBAAmB,CAC7B,MAAM,SAAS,MAAM,EACrB,GAAG,SAAS,SAAS,GAAG,YAAY,IAClC,QAAQ,CACV,MAAM,SAAS,MAAM,kBAAkB,GACnC,kBAAkB,CAAC,MAAM,CAAC,SAAS;KAChC,CAAC,IAAI,GAAG,GAAG,MAAM,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;CACpD,GACC,YAAY,CAAC,KAAK,CAAC,GACnB,YAAY,GACd,YAAY,CACjB,CAAA"}
|
|
@@ -5,10 +5,15 @@ import type { Account } from '../../types/account.js'
|
|
|
5
5
|
import type { ExtractCapabilities } from '../../types/capabilities.js'
|
|
6
6
|
import type { Chain } from '../../types/chain.js'
|
|
7
7
|
import type { WalletGetCallsStatusReturnType } from '../../types/eip1193.js'
|
|
8
|
+
import type { Hex } from '../../types/misc.js'
|
|
9
|
+
import type { RpcTransactionReceipt } from '../../types/rpc.js'
|
|
8
10
|
import type { Prettify } from '../../types/utils.js'
|
|
9
11
|
import type { RequestErrorType } from '../../utils/buildRequest.js'
|
|
12
|
+
import { sliceHex } from '../../utils/data/slice.js'
|
|
13
|
+
import { trim } from '../../utils/data/trim.js'
|
|
10
14
|
import { hexToBigInt, hexToNumber } from '../../utils/encoding/fromHex.js'
|
|
11
15
|
import { receiptStatuses } from '../../utils/formatters/transactionReceipt.js'
|
|
16
|
+
import { transactionMagicIdentifier } from './sendCalls.js'
|
|
12
17
|
|
|
13
18
|
export type GetCallsStatusParameters = { id: string }
|
|
14
19
|
|
|
@@ -56,16 +61,54 @@ export async function getCallsStatus<
|
|
|
56
61
|
client: Client<Transport, chain, account>,
|
|
57
62
|
parameters: GetCallsStatusParameters,
|
|
58
63
|
): Promise<GetCallsStatusReturnType> {
|
|
64
|
+
async function getStatus(id: Hex) {
|
|
65
|
+
const isTransactions = id.startsWith(transactionMagicIdentifier)
|
|
66
|
+
if (isTransactions) {
|
|
67
|
+
const chainId = trim(sliceHex(id, 32, 64))
|
|
68
|
+
const hashes = sliceHex(id, 64)
|
|
69
|
+
.slice(2)
|
|
70
|
+
.match(/.{1,64}/g)
|
|
71
|
+
|
|
72
|
+
const receipts = await Promise.all(
|
|
73
|
+
hashes!.map((hash) =>
|
|
74
|
+
client.request(
|
|
75
|
+
{
|
|
76
|
+
method: 'eth_getTransactionReceipt',
|
|
77
|
+
params: [`0x${hash}`],
|
|
78
|
+
},
|
|
79
|
+
{ dedupe: true },
|
|
80
|
+
),
|
|
81
|
+
),
|
|
82
|
+
)
|
|
83
|
+
|
|
84
|
+
const status = (() => {
|
|
85
|
+
if (receipts.some((r) => r === null)) return 100 // pending
|
|
86
|
+
if (receipts.every((r) => r?.status === '0x1')) return 200 // success
|
|
87
|
+
if (receipts.every((r) => r?.status === '0x0')) return 500 // complete failure
|
|
88
|
+
return 600 // partial failure
|
|
89
|
+
})()
|
|
90
|
+
|
|
91
|
+
return {
|
|
92
|
+
atomic: false,
|
|
93
|
+
chainId: hexToNumber(chainId),
|
|
94
|
+
receipts: receipts.filter(Boolean) as RpcTransactionReceipt[],
|
|
95
|
+
status,
|
|
96
|
+
version: '2.0.0',
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
return client.request({
|
|
100
|
+
method: 'wallet_getCallsStatus',
|
|
101
|
+
params: [id],
|
|
102
|
+
})
|
|
103
|
+
}
|
|
104
|
+
|
|
59
105
|
const {
|
|
60
106
|
atomic = false,
|
|
61
107
|
chainId,
|
|
62
108
|
receipts,
|
|
63
109
|
version = '2.0.0',
|
|
64
110
|
...response
|
|
65
|
-
} = await
|
|
66
|
-
method: 'wallet_getCallsStatus',
|
|
67
|
-
params: [parameters.id],
|
|
68
|
-
})
|
|
111
|
+
} = await getStatus(parameters.id as Hex)
|
|
69
112
|
const [status, statusCode] = (() => {
|
|
70
113
|
const statusCode = response.status
|
|
71
114
|
if (statusCode >= 100 && statusCode < 200)
|
|
@@ -10,11 +10,18 @@ import type { Call, Calls } from '../../types/calls.js'
|
|
|
10
10
|
import type { ExtractCapabilities } from '../../types/capabilities.js'
|
|
11
11
|
import type { Chain, DeriveChain } from '../../types/chain.js'
|
|
12
12
|
import type { WalletSendCallsParameters } from '../../types/eip1193.js'
|
|
13
|
+
import type { Hex } from '../../types/misc.js'
|
|
13
14
|
import type { Prettify } from '../../types/utils.js'
|
|
14
15
|
import { encodeFunctionData } from '../../utils/abi/encodeFunctionData.js'
|
|
15
16
|
import type { RequestErrorType } from '../../utils/buildRequest.js'
|
|
17
|
+
import { concat } from '../../utils/data/concat.js'
|
|
18
|
+
import { hexToBigInt } from '../../utils/encoding/fromHex.js'
|
|
16
19
|
import { numberToHex } from '../../utils/encoding/toHex.js'
|
|
17
20
|
import { getTransactionError } from '../../utils/errors/getTransactionError.js'
|
|
21
|
+
import { sendTransaction } from './sendTransaction.js'
|
|
22
|
+
|
|
23
|
+
export const transactionMagicIdentifier =
|
|
24
|
+
'0x0000000000000000000000000000000000000000000000000000000000000000'
|
|
18
25
|
|
|
19
26
|
export type SendCallsParameters<
|
|
20
27
|
chain extends Chain | undefined = Chain | undefined,
|
|
@@ -82,7 +89,6 @@ export async function sendCalls<
|
|
|
82
89
|
): Promise<SendCallsReturnType> {
|
|
83
90
|
const {
|
|
84
91
|
account: account_ = client.account,
|
|
85
|
-
capabilities,
|
|
86
92
|
chain = client.chain,
|
|
87
93
|
forceAtomic = false,
|
|
88
94
|
id,
|
|
@@ -121,7 +127,7 @@ export async function sendCalls<
|
|
|
121
127
|
{
|
|
122
128
|
atomicRequired: forceAtomic,
|
|
123
129
|
calls,
|
|
124
|
-
capabilities,
|
|
130
|
+
capabilities: formatRequestCapabilities(parameters.capabilities),
|
|
125
131
|
chainId: numberToHex(chain!.id),
|
|
126
132
|
from: account?.address,
|
|
127
133
|
id,
|
|
@@ -134,6 +140,38 @@ export async function sendCalls<
|
|
|
134
140
|
if (typeof response === 'string') return { id: response }
|
|
135
141
|
return response as never
|
|
136
142
|
} catch (err) {
|
|
143
|
+
const error = err as BaseError
|
|
144
|
+
|
|
145
|
+
// If the transport does not support EIP-5792, fall back to
|
|
146
|
+
// `eth_sendTransaction`.
|
|
147
|
+
if (
|
|
148
|
+
error.name === 'MethodNotFoundRpcError' ||
|
|
149
|
+
error.name === 'MethodNotSupportedRpcError' ||
|
|
150
|
+
error.details.toLowerCase().includes('does not exist') ||
|
|
151
|
+
error.details.toLowerCase().includes('missing or invalid')
|
|
152
|
+
) {
|
|
153
|
+
const promises: Promise<Hex>[] = []
|
|
154
|
+
for (const call of calls) {
|
|
155
|
+
const promise = sendTransaction(client, {
|
|
156
|
+
account,
|
|
157
|
+
chain,
|
|
158
|
+
data: call.data,
|
|
159
|
+
to: call.to,
|
|
160
|
+
value: call.value ? hexToBigInt(call.value) : undefined,
|
|
161
|
+
})
|
|
162
|
+
promises.push(promise)
|
|
163
|
+
await new Promise((resolve) => setTimeout(resolve, 32))
|
|
164
|
+
}
|
|
165
|
+
const hashes = await Promise.all(promises)
|
|
166
|
+
return {
|
|
167
|
+
id: concat([
|
|
168
|
+
transactionMagicIdentifier,
|
|
169
|
+
numberToHex(chain!.id, { size: 32 }),
|
|
170
|
+
...hashes,
|
|
171
|
+
]),
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
|
|
137
175
|
throw getTransactionError(err as BaseError, {
|
|
138
176
|
...parameters,
|
|
139
177
|
account,
|
|
@@ -141,3 +179,26 @@ export async function sendCalls<
|
|
|
141
179
|
})
|
|
142
180
|
}
|
|
143
181
|
}
|
|
182
|
+
|
|
183
|
+
function formatRequestCapabilities(
|
|
184
|
+
capabilities: ExtractCapabilities<'sendCalls', 'Request'> | undefined,
|
|
185
|
+
) {
|
|
186
|
+
const paymasterService = capabilities?.paymasterService
|
|
187
|
+
? Object.entries(capabilities.paymasterService).reduce(
|
|
188
|
+
(paymasterService, [chainId, value]) => ({
|
|
189
|
+
...(paymasterService ?? {}),
|
|
190
|
+
[numberToHex(Number(chainId))]: value,
|
|
191
|
+
}),
|
|
192
|
+
{},
|
|
193
|
+
)
|
|
194
|
+
: undefined
|
|
195
|
+
|
|
196
|
+
return {
|
|
197
|
+
...capabilities,
|
|
198
|
+
...(paymasterService
|
|
199
|
+
? {
|
|
200
|
+
paymasterService,
|
|
201
|
+
}
|
|
202
|
+
: {}),
|
|
203
|
+
}
|
|
204
|
+
}
|
package/errors/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = '2.
|
|
1
|
+
export const version = '2.30.0-jxom-send-calls-fallback-20250514150632'
|
package/package.json
CHANGED
package/types/capabilities.ts
CHANGED
|
@@ -60,9 +60,11 @@ export type DefaultCapabilitiesSchema = {
|
|
|
60
60
|
Request: {
|
|
61
61
|
paymasterService?:
|
|
62
62
|
| {
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
63
|
+
[chainId: number]: {
|
|
64
|
+
context?: Record<string, any> | undefined
|
|
65
|
+
optional?: boolean | undefined
|
|
66
|
+
url: string
|
|
67
|
+
}
|
|
66
68
|
}
|
|
67
69
|
| undefined
|
|
68
70
|
}
|