viem 2.29.4 → 2.30.0-canary-20250519114125
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 +10 -0
- package/_cjs/actions/wallet/getCallsStatus.js +39 -4
- package/_cjs/actions/wallet/getCallsStatus.js.map +1 -1
- package/_cjs/actions/wallet/sendCalls.js +66 -1
- 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/_cjs/zksync/utils/getEip712Domain.js +1 -1
- package/_cjs/zksync/utils/getEip712Domain.js.map +1 -1
- package/_esm/actions/wallet/getCallsStatus.js +39 -4
- package/_esm/actions/wallet/getCallsStatus.js.map +1 -1
- package/_esm/actions/wallet/sendCalls.js +69 -1
- 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/_esm/zksync/utils/getEip712Domain.js +1 -1
- package/_esm/zksync/utils/getEip712Domain.js.map +1 -1
- package/_types/actions/wallet/getCallsStatus.d.ts.map +1 -1
- package/_types/actions/wallet/sendCalls.d.ts +4 -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/actions/wallet/getCallsStatus.ts +52 -4
- package/actions/wallet/sendCalls.ts +94 -1
- package/errors/version.ts +1 -1
- package/package.json +1 -1
- package/zksync/utils/getEip712Domain.ts +1 -1
package/CHANGELOG.md
CHANGED
@@ -1,5 +1,15 @@
|
|
1
1
|
# viem
|
2
2
|
|
3
|
+
## 2.30.0-canary-20250519114125
|
4
|
+
|
5
|
+
### Minor Changes
|
6
|
+
|
7
|
+
- [#3657](https://github.com/wevm/viem/pull/3657) [`b9a1ac1673df3e17aba8e1157ac3da32be56018e`](https://github.com/wevm/viem/commit/b9a1ac1673df3e17aba8e1157ac3da32be56018e) Thanks [@jxom](https://github.com/jxom)! - Added `experimental_fallback` property to `sendCalls` for wallets that do not support EIP-5792 (falls back to `eth_sendTransaction`).
|
8
|
+
|
9
|
+
### Patch Changes
|
10
|
+
|
11
|
+
- [#3658](https://github.com/wevm/viem/pull/3658) [`5d9bdabd61a95a22a914c78c242fa9cfbc803ed1`](https://github.com/wevm/viem/commit/5d9bdabd61a95a22a914c78c242fa9cfbc803ed1) Thanks [@ly0va](https://github.com/ly0va)! - **ZKsync Extension:** Fixed default data value.
|
12
|
+
|
3
13
|
## 2.29.4
|
4
14
|
|
5
15
|
### Patch Changes
|
@@ -1,13 +1,48 @@
|
|
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.endsWith(sendCalls_js_1.fallbackMagicIdentifier.slice(2));
|
12
|
+
if (isTransactions) {
|
13
|
+
const chainId = (0, trim_js_1.trim)((0, slice_js_1.sliceHex)(id, -64, -32));
|
14
|
+
const hashes = (0, slice_js_1.sliceHex)(id, 0, -64)
|
15
|
+
.slice(2)
|
16
|
+
.match(/.{1,64}/g);
|
17
|
+
const receipts = await Promise.all(hashes.map((hash) => sendCalls_js_1.fallbackTransactionErrorMagicIdentifier.slice(2) !== hash
|
18
|
+
? client.request({
|
19
|
+
method: 'eth_getTransactionReceipt',
|
20
|
+
params: [`0x${hash}`],
|
21
|
+
}, { dedupe: true })
|
22
|
+
: undefined));
|
23
|
+
const status = (() => {
|
24
|
+
if (receipts.some((r) => r === null))
|
25
|
+
return 100;
|
26
|
+
if (receipts.every((r) => r?.status === '0x1'))
|
27
|
+
return 200;
|
28
|
+
if (receipts.every((r) => r?.status === '0x0'))
|
29
|
+
return 500;
|
30
|
+
return 600;
|
31
|
+
})();
|
32
|
+
return {
|
33
|
+
atomic: false,
|
34
|
+
chainId: (0, fromHex_js_1.hexToNumber)(chainId),
|
35
|
+
receipts: receipts.filter(Boolean),
|
36
|
+
status,
|
37
|
+
version: '2.0.0',
|
38
|
+
};
|
39
|
+
}
|
40
|
+
return client.request({
|
41
|
+
method: 'wallet_getCallsStatus',
|
42
|
+
params: [id],
|
43
|
+
});
|
44
|
+
}
|
45
|
+
const { atomic = false, chainId, receipts, version = '2.0.0', ...response } = await getStatus(parameters.id);
|
11
46
|
const [status, statusCode] = (() => {
|
12
47
|
const statusCode = response.status;
|
13
48
|
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,23 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.fallbackTransactionErrorMagicIdentifier = exports.fallbackMagicIdentifier = 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");
|
7
|
+
const base_js_1 = require("../../errors/base.js");
|
8
|
+
const rpc_js_1 = require("../../errors/rpc.js");
|
6
9
|
const encodeFunctionData_js_1 = require("../../utils/abi/encodeFunctionData.js");
|
10
|
+
const concat_js_1 = require("../../utils/data/concat.js");
|
11
|
+
const fromHex_js_1 = require("../../utils/encoding/fromHex.js");
|
7
12
|
const toHex_js_1 = require("../../utils/encoding/toHex.js");
|
8
13
|
const getTransactionError_js_1 = require("../../utils/errors/getTransactionError.js");
|
14
|
+
const sendTransaction_js_1 = require("./sendTransaction.js");
|
15
|
+
exports.fallbackMagicIdentifier = '0x5792579257925792579257925792579257925792579257925792579257925792';
|
16
|
+
exports.fallbackTransactionErrorMagicIdentifier = (0, toHex_js_1.numberToHex)(0, {
|
17
|
+
size: 32,
|
18
|
+
});
|
9
19
|
async function sendCalls(client, parameters) {
|
10
|
-
const { account: account_ = client.account, capabilities, chain = client.chain, forceAtomic = false, id, version = '2.0.0', } = parameters;
|
20
|
+
const { account: account_ = client.account, capabilities, chain = client.chain, experimental_fallback, experimental_fallbackDelay = 32, forceAtomic = false, id, version = '2.0.0', } = parameters;
|
11
21
|
if (typeof account_ === 'undefined')
|
12
22
|
throw new account_js_1.AccountNotFoundError({
|
13
23
|
docsPath: '/docs/actions/wallet/sendCalls',
|
@@ -48,6 +58,61 @@ async function sendCalls(client, parameters) {
|
|
48
58
|
return response;
|
49
59
|
}
|
50
60
|
catch (err) {
|
61
|
+
const error = err;
|
62
|
+
if (experimental_fallback &&
|
63
|
+
(error.name === 'MethodNotFoundRpcError' ||
|
64
|
+
error.name === 'MethodNotSupportedRpcError' ||
|
65
|
+
error.details
|
66
|
+
.toLowerCase()
|
67
|
+
.includes('does not exist / is not available') ||
|
68
|
+
error.details.toLowerCase().includes('missing or invalid. request()') ||
|
69
|
+
error.details
|
70
|
+
.toLowerCase()
|
71
|
+
.includes('did not match any variant of untagged enum'))) {
|
72
|
+
if (capabilities) {
|
73
|
+
const hasNonOptionalCapability = Object.values(capabilities).some((capability) => !capability.optional);
|
74
|
+
if (hasNonOptionalCapability) {
|
75
|
+
const message = 'non-optional `capabilities` are not supported on fallback to `eth_sendTransaction`.';
|
76
|
+
throw new rpc_js_1.UnsupportedNonOptionalCapabilityError(new base_js_1.BaseError(message, {
|
77
|
+
details: message,
|
78
|
+
}));
|
79
|
+
}
|
80
|
+
}
|
81
|
+
if (forceAtomic && calls.length > 1) {
|
82
|
+
const message = '`forceAtomic` is not supported on fallback to `eth_sendTransaction`.';
|
83
|
+
throw new rpc_js_1.AtomicityNotSupportedError(new base_js_1.BaseError(message, {
|
84
|
+
details: message,
|
85
|
+
}));
|
86
|
+
}
|
87
|
+
const promises = [];
|
88
|
+
for (const call of calls) {
|
89
|
+
const promise = (0, sendTransaction_js_1.sendTransaction)(client, {
|
90
|
+
account,
|
91
|
+
chain,
|
92
|
+
data: call.data,
|
93
|
+
to: call.to,
|
94
|
+
value: call.value ? (0, fromHex_js_1.hexToBigInt)(call.value) : undefined,
|
95
|
+
});
|
96
|
+
promises.push(promise);
|
97
|
+
if (experimental_fallbackDelay > 0)
|
98
|
+
await new Promise((resolve) => setTimeout(resolve, experimental_fallbackDelay));
|
99
|
+
}
|
100
|
+
const results = await Promise.allSettled(promises);
|
101
|
+
if (results.every((r) => r.status === 'rejected'))
|
102
|
+
throw results[0].reason;
|
103
|
+
const hashes = results.map((result) => {
|
104
|
+
if (result.status === 'fulfilled')
|
105
|
+
return result.value;
|
106
|
+
return exports.fallbackTransactionErrorMagicIdentifier;
|
107
|
+
});
|
108
|
+
return {
|
109
|
+
id: (0, concat_js_1.concat)([
|
110
|
+
...hashes,
|
111
|
+
(0, toHex_js_1.numberToHex)(chain.id, { size: 32 }),
|
112
|
+
exports.fallbackMagicIdentifier,
|
113
|
+
]),
|
114
|
+
};
|
115
|
+
}
|
51
116
|
throw (0, getTransactionError_js_1.getTransactionError)(err, {
|
52
117
|
...parameters,
|
53
118
|
account,
|
@@ -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":"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"}
|
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,8BAA8B,CAAA"}
|
@@ -49,7 +49,7 @@ function transactionToMessage(transaction) {
|
|
49
49
|
paymaster: paymaster ? BigInt(paymaster) : 0n,
|
50
50
|
nonce: nonce ? BigInt(nonce) : 0n,
|
51
51
|
value: value ?? 0n,
|
52
|
-
data: data
|
52
|
+
data: data ?? '0x',
|
53
53
|
factoryDeps: factoryDeps?.map((dep) => (0, toHex_js_1.toHex)((0, hashBytecode_js_1.hashBytecode)(dep))) ?? [],
|
54
54
|
paymasterInput: paymasterInput ? paymasterInput : '0x',
|
55
55
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getEip712Domain.js","sourceRoot":"","sources":["../../../zksync/utils/getEip712Domain.ts"],"names":[],"mappings":";;;AAAA,4DAAqD;AACrD,sDAA6D;AAO7D,6EAAsE;AACtE,uDAAgD;AAEzC,MAAM,eAAe,GAGxB,CAAC,WAAW,EAAE,EAAE;IAClB,IAAA,oDAAuB,EAAC,WAAW,CAAC,CAAA;IAEpC,MAAM,OAAO,GAAG,oBAAoB,CAClC,WAAkD,CACnD,CAAA;IAED,OAAO;QACL,MAAM,EAAE;YACN,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,GAAG;YACZ,OAAO,EAAE,WAAW,CAAC,OAAO;SAC7B;QACD,KAAK,EAAE;YACL,WAAW,EAAE;gBACX,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE;gBACnC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE;gBACjC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE;gBAC/B,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE;gBACrC,EAAE,IAAI,EAAE,wBAAwB,EAAE,IAAI,EAAE,SAAS,EAAE;gBACnD,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE;gBACzC,EAAE,IAAI,EAAE,sBAAsB,EAAE,IAAI,EAAE,SAAS,EAAE;gBACjD,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE;gBACtC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;gBAClC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;gBAClC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE;gBAC/B,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,WAAW,EAAE;gBAC1C,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,OAAO,EAAE;aAC1C;SACF;QACD,WAAW,EAAE,aAAa;QAC1B,OAAO,EAAE,OAAO;KACjB,CAAA;AACH,CAAC,CAAA;AApCY,QAAA,eAAe,mBAoC3B;AAKD,SAAS,oBAAoB,CAC3B,WAAgD;IAEhD,MAAM,EACJ,GAAG,EACH,KAAK,EACL,EAAE,EACF,IAAI,EACJ,KAAK,EACL,YAAY,EACZ,oBAAoB,EACpB,WAAW,EACX,SAAS,EACT,cAAc,EACd,aAAa,EACb,IAAI,GACL,GAAG,WAAW,CAAA;IAEf,OAAO;QACL,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC;QAClB,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE;QACxB,QAAQ,EAAE,GAAG,IAAI,EAAE;QACnB,sBAAsB,EAAE,aAAa,IAAI,gCAAoB;QAC7D,YAAY,EAAE,YAAY,IAAI,EAAE;QAChC,oBAAoB,EAAE,oBAAoB,IAAI,EAAE;QAChD,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE;QAC7C,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;QACjC,KAAK,EAAE,KAAK,IAAI,EAAE;QAClB,IAAI,EAAE,IAAI,
|
1
|
+
{"version":3,"file":"getEip712Domain.js","sourceRoot":"","sources":["../../../zksync/utils/getEip712Domain.ts"],"names":[],"mappings":";;;AAAA,4DAAqD;AACrD,sDAA6D;AAO7D,6EAAsE;AACtE,uDAAgD;AAEzC,MAAM,eAAe,GAGxB,CAAC,WAAW,EAAE,EAAE;IAClB,IAAA,oDAAuB,EAAC,WAAW,CAAC,CAAA;IAEpC,MAAM,OAAO,GAAG,oBAAoB,CAClC,WAAkD,CACnD,CAAA;IAED,OAAO;QACL,MAAM,EAAE;YACN,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,GAAG;YACZ,OAAO,EAAE,WAAW,CAAC,OAAO;SAC7B;QACD,KAAK,EAAE;YACL,WAAW,EAAE;gBACX,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE;gBACnC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE;gBACjC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE;gBAC/B,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE;gBACrC,EAAE,IAAI,EAAE,wBAAwB,EAAE,IAAI,EAAE,SAAS,EAAE;gBACnD,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE;gBACzC,EAAE,IAAI,EAAE,sBAAsB,EAAE,IAAI,EAAE,SAAS,EAAE;gBACjD,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE;gBACtC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;gBAClC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;gBAClC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE;gBAC/B,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,WAAW,EAAE;gBAC1C,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,OAAO,EAAE;aAC1C;SACF;QACD,WAAW,EAAE,aAAa;QAC1B,OAAO,EAAE,OAAO;KACjB,CAAA;AACH,CAAC,CAAA;AApCY,QAAA,eAAe,mBAoC3B;AAKD,SAAS,oBAAoB,CAC3B,WAAgD;IAEhD,MAAM,EACJ,GAAG,EACH,KAAK,EACL,EAAE,EACF,IAAI,EACJ,KAAK,EACL,YAAY,EACZ,oBAAoB,EACpB,WAAW,EACX,SAAS,EACT,cAAc,EACd,aAAa,EACb,IAAI,GACL,GAAG,WAAW,CAAA;IAEf,OAAO;QACL,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC;QAClB,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE;QACxB,QAAQ,EAAE,GAAG,IAAI,EAAE;QACnB,sBAAsB,EAAE,aAAa,IAAI,gCAAoB;QAC7D,YAAY,EAAE,YAAY,IAAI,EAAE;QAChC,oBAAoB,EAAE,oBAAoB,IAAI,EAAE;QAChD,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE;QAC7C,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;QACjC,KAAK,EAAE,KAAK,IAAI,EAAE;QAClB,IAAI,EAAE,IAAI,IAAI,IAAI;QAClB,WAAW,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,gBAAK,EAAC,IAAA,8BAAY,EAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE;QACtE,cAAc,EAAE,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI;KACvD,CAAA;AACH,CAAC"}
|
@@ -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 { fallbackMagicIdentifier, fallbackTransactionErrorMagicIdentifier, } from './sendCalls.js';
|
3
6
|
/**
|
4
7
|
* Returns the status of a call batch that was sent via `sendCalls`.
|
5
8
|
*
|
@@ -21,10 +24,42 @@ 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.endsWith(fallbackMagicIdentifier.slice(2));
|
29
|
+
if (isTransactions) {
|
30
|
+
const chainId = trim(sliceHex(id, -64, -32));
|
31
|
+
const hashes = sliceHex(id, 0, -64)
|
32
|
+
.slice(2)
|
33
|
+
.match(/.{1,64}/g);
|
34
|
+
const receipts = await Promise.all(hashes.map((hash) => fallbackTransactionErrorMagicIdentifier.slice(2) !== hash
|
35
|
+
? client.request({
|
36
|
+
method: 'eth_getTransactionReceipt',
|
37
|
+
params: [`0x${hash}`],
|
38
|
+
}, { dedupe: true })
|
39
|
+
: undefined));
|
40
|
+
const status = (() => {
|
41
|
+
if (receipts.some((r) => r === null))
|
42
|
+
return 100; // pending
|
43
|
+
if (receipts.every((r) => r?.status === '0x1'))
|
44
|
+
return 200; // success
|
45
|
+
if (receipts.every((r) => r?.status === '0x0'))
|
46
|
+
return 500; // complete failure
|
47
|
+
return 600; // partial failure
|
48
|
+
})();
|
49
|
+
return {
|
50
|
+
atomic: false,
|
51
|
+
chainId: hexToNumber(chainId),
|
52
|
+
receipts: receipts.filter(Boolean),
|
53
|
+
status,
|
54
|
+
version: '2.0.0',
|
55
|
+
};
|
56
|
+
}
|
57
|
+
return client.request({
|
58
|
+
method: 'wallet_getCallsStatus',
|
59
|
+
params: [id],
|
60
|
+
});
|
61
|
+
}
|
62
|
+
const { atomic = false, chainId, receipts, version = '2.0.0', ...response } = await getStatus(parameters.id);
|
28
63
|
const [status, statusCode] = (() => {
|
29
64
|
const statusCode = response.status;
|
30
65
|
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,17 @@
|
|
1
1
|
import { parseAccount } from '../../accounts/utils/parseAccount.js';
|
2
2
|
import { AccountNotFoundError } from '../../errors/account.js';
|
3
|
+
import { BaseError } from '../../errors/base.js';
|
4
|
+
import { AtomicityNotSupportedError, UnsupportedNonOptionalCapabilityError, } from '../../errors/rpc.js';
|
3
5
|
import { encodeFunctionData } from '../../utils/abi/encodeFunctionData.js';
|
6
|
+
import { concat } from '../../utils/data/concat.js';
|
7
|
+
import { hexToBigInt } from '../../utils/encoding/fromHex.js';
|
4
8
|
import { numberToHex } from '../../utils/encoding/toHex.js';
|
5
9
|
import { getTransactionError } from '../../utils/errors/getTransactionError.js';
|
10
|
+
import { sendTransaction } from './sendTransaction.js';
|
11
|
+
export const fallbackMagicIdentifier = '0x5792579257925792579257925792579257925792579257925792579257925792';
|
12
|
+
export const fallbackTransactionErrorMagicIdentifier = numberToHex(0, {
|
13
|
+
size: 32,
|
14
|
+
});
|
6
15
|
/**
|
7
16
|
* Requests the connected wallet to send a batch of calls.
|
8
17
|
*
|
@@ -36,7 +45,7 @@ import { getTransactionError } from '../../utils/errors/getTransactionError.js';
|
|
36
45
|
* })
|
37
46
|
*/
|
38
47
|
export async function sendCalls(client, parameters) {
|
39
|
-
const { account: account_ = client.account, capabilities, chain = client.chain, forceAtomic = false, id, version = '2.0.0', } = parameters;
|
48
|
+
const { account: account_ = client.account, capabilities, chain = client.chain, experimental_fallback, experimental_fallbackDelay = 32, forceAtomic = false, id, version = '2.0.0', } = parameters;
|
40
49
|
if (typeof account_ === 'undefined')
|
41
50
|
throw new AccountNotFoundError({
|
42
51
|
docsPath: '/docs/actions/wallet/sendCalls',
|
@@ -77,6 +86,65 @@ export async function sendCalls(client, parameters) {
|
|
77
86
|
return response;
|
78
87
|
}
|
79
88
|
catch (err) {
|
89
|
+
const error = err;
|
90
|
+
// If the transport does not support EIP-5792, fall back to
|
91
|
+
// `eth_sendTransaction`.
|
92
|
+
if (experimental_fallback &&
|
93
|
+
(error.name === 'MethodNotFoundRpcError' ||
|
94
|
+
error.name === 'MethodNotSupportedRpcError' ||
|
95
|
+
error.details
|
96
|
+
.toLowerCase()
|
97
|
+
.includes('does not exist / is not available') ||
|
98
|
+
error.details.toLowerCase().includes('missing or invalid. request()') ||
|
99
|
+
error.details
|
100
|
+
.toLowerCase()
|
101
|
+
.includes('did not match any variant of untagged enum'))) {
|
102
|
+
if (capabilities) {
|
103
|
+
const hasNonOptionalCapability = Object.values(capabilities).some((capability) => !capability.optional);
|
104
|
+
if (hasNonOptionalCapability) {
|
105
|
+
const message = 'non-optional `capabilities` are not supported on fallback to `eth_sendTransaction`.';
|
106
|
+
throw new UnsupportedNonOptionalCapabilityError(new BaseError(message, {
|
107
|
+
details: message,
|
108
|
+
}));
|
109
|
+
}
|
110
|
+
}
|
111
|
+
if (forceAtomic && calls.length > 1) {
|
112
|
+
const message = '`forceAtomic` is not supported on fallback to `eth_sendTransaction`.';
|
113
|
+
throw new AtomicityNotSupportedError(new BaseError(message, {
|
114
|
+
details: message,
|
115
|
+
}));
|
116
|
+
}
|
117
|
+
const promises = [];
|
118
|
+
for (const call of calls) {
|
119
|
+
const promise = sendTransaction(client, {
|
120
|
+
account,
|
121
|
+
chain,
|
122
|
+
data: call.data,
|
123
|
+
to: call.to,
|
124
|
+
value: call.value ? hexToBigInt(call.value) : undefined,
|
125
|
+
});
|
126
|
+
promises.push(promise);
|
127
|
+
// Note: some browser wallets require a small delay between transactions
|
128
|
+
// to prevent duplicate JSON-RPC requests.
|
129
|
+
if (experimental_fallbackDelay > 0)
|
130
|
+
await new Promise((resolve) => setTimeout(resolve, experimental_fallbackDelay));
|
131
|
+
}
|
132
|
+
const results = await Promise.allSettled(promises);
|
133
|
+
if (results.every((r) => r.status === 'rejected'))
|
134
|
+
throw results[0].reason;
|
135
|
+
const hashes = results.map((result) => {
|
136
|
+
if (result.status === 'fulfilled')
|
137
|
+
return result.value;
|
138
|
+
return fallbackTransactionErrorMagicIdentifier;
|
139
|
+
});
|
140
|
+
return {
|
141
|
+
id: concat([
|
142
|
+
...hashes,
|
143
|
+
numberToHex(chain.id, { size: 32 }),
|
144
|
+
fallbackMagicIdentifier,
|
145
|
+
]),
|
146
|
+
};
|
147
|
+
}
|
80
148
|
throw getTransactionError(err, {
|
81
149
|
...parameters,
|
82
150
|
account,
|
@@ -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-canary-20250519114125';
|
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,8BAA8B,CAAA"}
|
@@ -47,7 +47,7 @@ function transactionToMessage(transaction) {
|
|
47
47
|
paymaster: paymaster ? BigInt(paymaster) : 0n,
|
48
48
|
nonce: nonce ? BigInt(nonce) : 0n,
|
49
49
|
value: value ?? 0n,
|
50
|
-
data: data
|
50
|
+
data: data ?? '0x',
|
51
51
|
factoryDeps: factoryDeps?.map((dep) => toHex(hashBytecode(dep))) ?? [],
|
52
52
|
paymasterInput: paymasterInput ? paymasterInput : '0x',
|
53
53
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getEip712Domain.js","sourceRoot":"","sources":["../../../zksync/utils/getEip712Domain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAA;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAO7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEhD,MAAM,CAAC,MAAM,eAAe,GAGxB,CAAC,WAAW,EAAE,EAAE;IAClB,uBAAuB,CAAC,WAAW,CAAC,CAAA;IAEpC,MAAM,OAAO,GAAG,oBAAoB,CAClC,WAAkD,CACnD,CAAA;IAED,OAAO;QACL,MAAM,EAAE;YACN,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,GAAG;YACZ,OAAO,EAAE,WAAW,CAAC,OAAO;SAC7B;QACD,KAAK,EAAE;YACL,WAAW,EAAE;gBACX,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE;gBACnC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE;gBACjC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE;gBAC/B,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE;gBACrC,EAAE,IAAI,EAAE,wBAAwB,EAAE,IAAI,EAAE,SAAS,EAAE;gBACnD,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE;gBACzC,EAAE,IAAI,EAAE,sBAAsB,EAAE,IAAI,EAAE,SAAS,EAAE;gBACjD,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE;gBACtC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;gBAClC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;gBAClC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE;gBAC/B,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,WAAW,EAAE;gBAC1C,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,OAAO,EAAE;aAC1C;SACF;QACD,WAAW,EAAE,aAAa;QAC1B,OAAO,EAAE,OAAO;KACjB,CAAA;AACH,CAAC,CAAA;AAED,8EAA8E;AAC9E,YAAY;AAEZ,SAAS,oBAAoB,CAC3B,WAAgD;IAEhD,MAAM,EACJ,GAAG,EACH,KAAK,EACL,EAAE,EACF,IAAI,EACJ,KAAK,EACL,YAAY,EACZ,oBAAoB,EACpB,WAAW,EACX,SAAS,EACT,cAAc,EACd,aAAa,EACb,IAAI,GACL,GAAG,WAAW,CAAA;IAEf,OAAO;QACL,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC;QAClB,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE;QACxB,QAAQ,EAAE,GAAG,IAAI,EAAE;QACnB,sBAAsB,EAAE,aAAa,IAAI,oBAAoB;QAC7D,YAAY,EAAE,YAAY,IAAI,EAAE;QAChC,oBAAoB,EAAE,oBAAoB,IAAI,EAAE;QAChD,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE;QAC7C,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;QACjC,KAAK,EAAE,KAAK,IAAI,EAAE;QAClB,IAAI,EAAE,IAAI,
|
1
|
+
{"version":3,"file":"getEip712Domain.js","sourceRoot":"","sources":["../../../zksync/utils/getEip712Domain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAA;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAO7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEhD,MAAM,CAAC,MAAM,eAAe,GAGxB,CAAC,WAAW,EAAE,EAAE;IAClB,uBAAuB,CAAC,WAAW,CAAC,CAAA;IAEpC,MAAM,OAAO,GAAG,oBAAoB,CAClC,WAAkD,CACnD,CAAA;IAED,OAAO;QACL,MAAM,EAAE;YACN,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,GAAG;YACZ,OAAO,EAAE,WAAW,CAAC,OAAO;SAC7B;QACD,KAAK,EAAE;YACL,WAAW,EAAE;gBACX,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE;gBACnC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE;gBACjC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE;gBAC/B,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE;gBACrC,EAAE,IAAI,EAAE,wBAAwB,EAAE,IAAI,EAAE,SAAS,EAAE;gBACnD,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE;gBACzC,EAAE,IAAI,EAAE,sBAAsB,EAAE,IAAI,EAAE,SAAS,EAAE;gBACjD,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE;gBACtC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;gBAClC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;gBAClC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE;gBAC/B,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,WAAW,EAAE;gBAC1C,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,OAAO,EAAE;aAC1C;SACF;QACD,WAAW,EAAE,aAAa;QAC1B,OAAO,EAAE,OAAO;KACjB,CAAA;AACH,CAAC,CAAA;AAED,8EAA8E;AAC9E,YAAY;AAEZ,SAAS,oBAAoB,CAC3B,WAAgD;IAEhD,MAAM,EACJ,GAAG,EACH,KAAK,EACL,EAAE,EACF,IAAI,EACJ,KAAK,EACL,YAAY,EACZ,oBAAoB,EACpB,WAAW,EACX,SAAS,EACT,cAAc,EACd,aAAa,EACb,IAAI,GACL,GAAG,WAAW,CAAA;IAEf,OAAO;QACL,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC;QAClB,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE;QACxB,QAAQ,EAAE,GAAG,IAAI,EAAE;QACnB,sBAAsB,EAAE,aAAa,IAAI,oBAAoB;QAC7D,YAAY,EAAE,YAAY,IAAI,EAAE;QAChC,oBAAoB,EAAE,oBAAoB,IAAI,EAAE;QAChD,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE;QAC7C,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;QACjC,KAAK,EAAE,KAAK,IAAI,EAAE;QAClB,IAAI,EAAE,IAAI,IAAI,IAAI;QAClB,WAAW,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE;QACtE,cAAc,EAAE,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI;KACvD,CAAA;AACH,CAAC"}
|
@@ -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;AAUnE,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,CAiFnC"}
|
@@ -9,10 +9,14 @@ 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 fallbackMagicIdentifier = "0x5792579257925792579257925792579257925792579257925792579257925792";
|
13
|
+
export declare const fallbackTransactionErrorMagicIdentifier: `0x${string}`;
|
12
14
|
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
15
|
chain?: chainOverride | Chain | undefined;
|
14
16
|
calls: Calls<Narrow<calls>>;
|
15
17
|
capabilities?: ExtractCapabilities<'sendCalls', 'Request'> | undefined;
|
18
|
+
experimental_fallback?: boolean | undefined;
|
19
|
+
experimental_fallbackDelay?: number | undefined;
|
16
20
|
forceAtomic?: boolean | undefined;
|
17
21
|
id?: string | undefined;
|
18
22
|
version?: WalletSendCallsParameters[number]['version'] | undefined;
|
@@ -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;
|
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;AAO5E,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,uBAAuB,uEACkC,CAAA;AACtE,eAAO,MAAM,uCAAuC,eAElD,CAAA;AAEF,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,qBAAqB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC3C,0BAA0B,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC/C,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,CA0I9B"}
|
@@ -1,2 +1,2 @@
|
|
1
|
-
export declare const version = "2.
|
1
|
+
export declare const version = "2.30.0-canary-20250519114125";
|
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,iCAAiC,CAAA"}
|
@@ -5,10 +5,18 @@ 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 {
|
17
|
+
fallbackMagicIdentifier,
|
18
|
+
fallbackTransactionErrorMagicIdentifier,
|
19
|
+
} from './sendCalls.js'
|
12
20
|
|
13
21
|
export type GetCallsStatusParameters = { id: string }
|
14
22
|
|
@@ -56,16 +64,56 @@ export async function getCallsStatus<
|
|
56
64
|
client: Client<Transport, chain, account>,
|
57
65
|
parameters: GetCallsStatusParameters,
|
58
66
|
): Promise<GetCallsStatusReturnType> {
|
67
|
+
async function getStatus(id: Hex) {
|
68
|
+
const isTransactions = id.endsWith(fallbackMagicIdentifier.slice(2))
|
69
|
+
if (isTransactions) {
|
70
|
+
const chainId = trim(sliceHex(id, -64, -32))
|
71
|
+
const hashes = sliceHex(id, 0, -64)
|
72
|
+
.slice(2)
|
73
|
+
.match(/.{1,64}/g)
|
74
|
+
|
75
|
+
const receipts = await Promise.all(
|
76
|
+
hashes!.map((hash) =>
|
77
|
+
fallbackTransactionErrorMagicIdentifier.slice(2) !== hash
|
78
|
+
? client.request(
|
79
|
+
{
|
80
|
+
method: 'eth_getTransactionReceipt',
|
81
|
+
params: [`0x${hash}`],
|
82
|
+
},
|
83
|
+
{ dedupe: true },
|
84
|
+
)
|
85
|
+
: undefined,
|
86
|
+
),
|
87
|
+
)
|
88
|
+
|
89
|
+
const status = (() => {
|
90
|
+
if (receipts.some((r) => r === null)) return 100 // pending
|
91
|
+
if (receipts.every((r) => r?.status === '0x1')) return 200 // success
|
92
|
+
if (receipts.every((r) => r?.status === '0x0')) return 500 // complete failure
|
93
|
+
return 600 // partial failure
|
94
|
+
})()
|
95
|
+
|
96
|
+
return {
|
97
|
+
atomic: false,
|
98
|
+
chainId: hexToNumber(chainId),
|
99
|
+
receipts: receipts.filter(Boolean) as RpcTransactionReceipt[],
|
100
|
+
status,
|
101
|
+
version: '2.0.0',
|
102
|
+
}
|
103
|
+
}
|
104
|
+
return client.request({
|
105
|
+
method: 'wallet_getCallsStatus',
|
106
|
+
params: [id],
|
107
|
+
})
|
108
|
+
}
|
109
|
+
|
59
110
|
const {
|
60
111
|
atomic = false,
|
61
112
|
chainId,
|
62
113
|
receipts,
|
63
114
|
version = '2.0.0',
|
64
115
|
...response
|
65
|
-
} = await
|
66
|
-
method: 'wallet_getCallsStatus',
|
67
|
-
params: [parameters.id],
|
68
|
-
})
|
116
|
+
} = await getStatus(parameters.id as Hex)
|
69
117
|
const [status, statusCode] = (() => {
|
70
118
|
const statusCode = response.status
|
71
119
|
if (statusCode >= 100 && statusCode < 200)
|
@@ -3,18 +3,32 @@ import { parseAccount } from '../../accounts/utils/parseAccount.js'
|
|
3
3
|
import type { Client } from '../../clients/createClient.js'
|
4
4
|
import type { Transport } from '../../clients/transports/createTransport.js'
|
5
5
|
import { AccountNotFoundError } from '../../errors/account.js'
|
6
|
-
import
|
6
|
+
import { BaseError } from '../../errors/base.js'
|
7
|
+
import {
|
8
|
+
AtomicityNotSupportedError,
|
9
|
+
UnsupportedNonOptionalCapabilityError,
|
10
|
+
} from '../../errors/rpc.js'
|
7
11
|
import type { ErrorType } from '../../errors/utils.js'
|
8
12
|
import type { Account, GetAccountParameter } from '../../types/account.js'
|
9
13
|
import type { Call, Calls } from '../../types/calls.js'
|
10
14
|
import type { ExtractCapabilities } from '../../types/capabilities.js'
|
11
15
|
import type { Chain, DeriveChain } from '../../types/chain.js'
|
12
16
|
import type { WalletSendCallsParameters } from '../../types/eip1193.js'
|
17
|
+
import type { Hex } from '../../types/misc.js'
|
13
18
|
import type { Prettify } from '../../types/utils.js'
|
14
19
|
import { encodeFunctionData } from '../../utils/abi/encodeFunctionData.js'
|
15
20
|
import type { RequestErrorType } from '../../utils/buildRequest.js'
|
21
|
+
import { concat } from '../../utils/data/concat.js'
|
22
|
+
import { hexToBigInt } from '../../utils/encoding/fromHex.js'
|
16
23
|
import { numberToHex } from '../../utils/encoding/toHex.js'
|
17
24
|
import { getTransactionError } from '../../utils/errors/getTransactionError.js'
|
25
|
+
import { sendTransaction } from './sendTransaction.js'
|
26
|
+
|
27
|
+
export const fallbackMagicIdentifier =
|
28
|
+
'0x5792579257925792579257925792579257925792579257925792579257925792'
|
29
|
+
export const fallbackTransactionErrorMagicIdentifier = numberToHex(0, {
|
30
|
+
size: 32,
|
31
|
+
})
|
18
32
|
|
19
33
|
export type SendCallsParameters<
|
20
34
|
chain extends Chain | undefined = Chain | undefined,
|
@@ -27,6 +41,8 @@ export type SendCallsParameters<
|
|
27
41
|
chain?: chainOverride | Chain | undefined
|
28
42
|
calls: Calls<Narrow<calls>>
|
29
43
|
capabilities?: ExtractCapabilities<'sendCalls', 'Request'> | undefined
|
44
|
+
experimental_fallback?: boolean | undefined
|
45
|
+
experimental_fallbackDelay?: number | undefined
|
30
46
|
forceAtomic?: boolean | undefined
|
31
47
|
id?: string | undefined
|
32
48
|
version?: WalletSendCallsParameters[number]['version'] | undefined
|
@@ -84,6 +100,8 @@ export async function sendCalls<
|
|
84
100
|
account: account_ = client.account,
|
85
101
|
capabilities,
|
86
102
|
chain = client.chain,
|
103
|
+
experimental_fallback,
|
104
|
+
experimental_fallbackDelay = 32,
|
87
105
|
forceAtomic = false,
|
88
106
|
id,
|
89
107
|
version = '2.0.0',
|
@@ -134,6 +152,81 @@ export async function sendCalls<
|
|
134
152
|
if (typeof response === 'string') return { id: response }
|
135
153
|
return response as never
|
136
154
|
} catch (err) {
|
155
|
+
const error = err as BaseError
|
156
|
+
|
157
|
+
// If the transport does not support EIP-5792, fall back to
|
158
|
+
// `eth_sendTransaction`.
|
159
|
+
if (
|
160
|
+
experimental_fallback &&
|
161
|
+
(error.name === 'MethodNotFoundRpcError' ||
|
162
|
+
error.name === 'MethodNotSupportedRpcError' ||
|
163
|
+
error.details
|
164
|
+
.toLowerCase()
|
165
|
+
.includes('does not exist / is not available') ||
|
166
|
+
error.details.toLowerCase().includes('missing or invalid. request()') ||
|
167
|
+
error.details
|
168
|
+
.toLowerCase()
|
169
|
+
.includes('did not match any variant of untagged enum'))
|
170
|
+
) {
|
171
|
+
if (capabilities) {
|
172
|
+
const hasNonOptionalCapability = Object.values(capabilities).some(
|
173
|
+
(capability) => !capability.optional,
|
174
|
+
)
|
175
|
+
if (hasNonOptionalCapability) {
|
176
|
+
const message =
|
177
|
+
'non-optional `capabilities` are not supported on fallback to `eth_sendTransaction`.'
|
178
|
+
throw new UnsupportedNonOptionalCapabilityError(
|
179
|
+
new BaseError(message, {
|
180
|
+
details: message,
|
181
|
+
}),
|
182
|
+
)
|
183
|
+
}
|
184
|
+
}
|
185
|
+
if (forceAtomic && calls.length > 1) {
|
186
|
+
const message =
|
187
|
+
'`forceAtomic` is not supported on fallback to `eth_sendTransaction`.'
|
188
|
+
throw new AtomicityNotSupportedError(
|
189
|
+
new BaseError(message, {
|
190
|
+
details: message,
|
191
|
+
}),
|
192
|
+
)
|
193
|
+
}
|
194
|
+
|
195
|
+
const promises: Promise<Hex>[] = []
|
196
|
+
for (const call of calls) {
|
197
|
+
const promise = sendTransaction(client, {
|
198
|
+
account,
|
199
|
+
chain,
|
200
|
+
data: call.data,
|
201
|
+
to: call.to,
|
202
|
+
value: call.value ? hexToBigInt(call.value) : undefined,
|
203
|
+
})
|
204
|
+
promises.push(promise)
|
205
|
+
|
206
|
+
// Note: some browser wallets require a small delay between transactions
|
207
|
+
// to prevent duplicate JSON-RPC requests.
|
208
|
+
if (experimental_fallbackDelay > 0)
|
209
|
+
await new Promise((resolve) =>
|
210
|
+
setTimeout(resolve, experimental_fallbackDelay),
|
211
|
+
)
|
212
|
+
}
|
213
|
+
|
214
|
+
const results = await Promise.allSettled(promises)
|
215
|
+
if (results.every((r) => r.status === 'rejected')) throw results[0].reason
|
216
|
+
|
217
|
+
const hashes = results.map((result) => {
|
218
|
+
if (result.status === 'fulfilled') return result.value
|
219
|
+
return fallbackTransactionErrorMagicIdentifier
|
220
|
+
})
|
221
|
+
return {
|
222
|
+
id: concat([
|
223
|
+
...hashes,
|
224
|
+
numberToHex(chain!.id, { size: 32 }),
|
225
|
+
fallbackMagicIdentifier,
|
226
|
+
]),
|
227
|
+
}
|
228
|
+
}
|
229
|
+
|
137
230
|
throw getTransactionError(err as BaseError, {
|
138
231
|
...parameters,
|
139
232
|
account,
|
package/errors/version.ts
CHANGED
@@ -1 +1 @@
|
|
1
|
-
export const version = '2.
|
1
|
+
export const version = '2.30.0-canary-20250519114125'
|
package/package.json
CHANGED
@@ -79,7 +79,7 @@ function transactionToMessage(
|
|
79
79
|
paymaster: paymaster ? BigInt(paymaster) : 0n,
|
80
80
|
nonce: nonce ? BigInt(nonce) : 0n,
|
81
81
|
value: value ?? 0n,
|
82
|
-
data: data
|
82
|
+
data: data ?? '0x',
|
83
83
|
factoryDeps: factoryDeps?.map((dep) => toHex(hashBytecode(dep))) ?? [],
|
84
84
|
paymasterInput: paymasterInput ? paymasterInput : '0x',
|
85
85
|
}
|