viem 2.21.7 → 2.21.8
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +8 -0
- package/README.md +12 -6
- package/_cjs/chains/definitions/abstractTestnet.js +0 -32
- package/_cjs/chains/definitions/abstractTestnet.js.map +1 -1
- package/_cjs/errors/version.js +1 -1
- package/_cjs/utils/abi/parseEventLogs.js +2 -2
- package/_cjs/utils/abi/parseEventLogs.js.map +1 -1
- package/_cjs/zksync/utils/getEip712Domain.js +0 -1
- package/_cjs/zksync/utils/getEip712Domain.js.map +1 -1
- package/_esm/chains/definitions/abstractTestnet.js +0 -32
- package/_esm/chains/definitions/abstractTestnet.js.map +1 -1
- package/_esm/errors/version.js +1 -1
- package/_esm/utils/abi/parseEventLogs.js +2 -2
- package/_esm/utils/abi/parseEventLogs.js.map +1 -1
- package/_esm/zksync/utils/getEip712Domain.js +1 -1
- package/_esm/zksync/utils/getEip712Domain.js.map +1 -1
- package/_types/chains/definitions/abstractTestnet.d.ts +6 -21
- package/_types/chains/definitions/abstractTestnet.d.ts.map +1 -1
- package/_types/errors/version.d.ts +1 -1
- package/_types/zksync/utils/getEip712Domain.d.ts +1 -2
- package/_types/zksync/utils/getEip712Domain.d.ts.map +1 -1
- package/chains/definitions/abstractTestnet.ts +0 -34
- package/errors/version.ts +1 -1
- package/package.json +1 -1
- package/utils/abi/parseEventLogs.ts +2 -2
- package/zksync/utils/getEip712Domain.ts +1 -1
package/CHANGELOG.md
CHANGED
@@ -1,5 +1,13 @@
|
|
1
1
|
# viem
|
2
2
|
|
3
|
+
## 2.21.8
|
4
|
+
|
5
|
+
### Patch Changes
|
6
|
+
|
7
|
+
- [#2724](https://github.com/wevm/viem/pull/2724) [`c2b2c78`](https://github.com/wevm/viem/commit/c2b2c7887eb27ffe1e1db534036a0bb7ef3cad5c) Thanks [@cygaar](https://github.com/cygaar)! - Reverted custom Abstract EIP712 domain changes.
|
8
|
+
|
9
|
+
- [`2fa3d00`](https://github.com/wevm/viem/commit/2fa3d004467945efc548ac23a659c32a1e206cc4) Thanks [@jxom](https://github.com/jxom)! - Fixed zeroish log filter argument parsing.
|
10
|
+
|
3
11
|
## 2.21.7
|
4
12
|
|
5
13
|
### Patch Changes
|
package/README.md
CHANGED
@@ -129,12 +129,6 @@ Check out the following places for more viem-related content:
|
|
129
129
|
<img alt="WalletConnect logo" src="https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/walletconnect-light.svg" width="auto" height="50">
|
130
130
|
</picture>
|
131
131
|
</a>
|
132
|
-
<a href="https://zksync.io">
|
133
|
-
<picture>
|
134
|
-
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/zksync-dark.svg">
|
135
|
-
<img alt="ZKsync logo" src="https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/zksync-light.svg" width="auto" height="50">
|
136
|
-
</picture>
|
137
|
-
</a>
|
138
132
|
<a href="https://twitter.com/prtyDAO">
|
139
133
|
<picture>
|
140
134
|
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/partydao-dark.svg">
|
@@ -177,6 +171,12 @@ Check out the following places for more viem-related content:
|
|
177
171
|
<img alt="celo logo" src="https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/celo-light.svg" width="auto" height="50">
|
178
172
|
</picture>
|
179
173
|
</a>
|
174
|
+
<a href="https://rainbow.me">
|
175
|
+
<picture>
|
176
|
+
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/rainbow-dark.svg">
|
177
|
+
<img alt="rainbow logo" src="https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/rainbow-light.svg" width="auto" height="50">
|
178
|
+
</picture>
|
179
|
+
</a>
|
180
180
|
<a href="https://pimlico.io">
|
181
181
|
<picture>
|
182
182
|
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/pimlico-dark.svg">
|
@@ -201,6 +201,12 @@ Check out the following places for more viem-related content:
|
|
201
201
|
<img alt="supa logo" src="https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/supa-light.svg" width="auto" height="50">
|
202
202
|
</picture>
|
203
203
|
</a>
|
204
|
+
<a href="https://zksync.io">
|
205
|
+
<picture>
|
206
|
+
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/zksync-dark.svg">
|
207
|
+
<img alt="ZKsync logo" src="https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/zksync-light.svg" width="auto" height="50">
|
208
|
+
</picture>
|
209
|
+
</a>
|
204
210
|
<a href="https://syndicate.io">
|
205
211
|
<picture>
|
206
212
|
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/wevm/.github/main/content/sponsors/syndicate-dark.svg">
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.abstractTestnet = void 0;
|
4
4
|
const defineChain_js_1 = require("../../utils/chain/defineChain.js");
|
5
5
|
const chainConfig_js_1 = require("../../zksync/chainConfig.js");
|
6
|
-
const getEip712Domain_js_1 = require("../../zksync/utils/getEip712Domain.js");
|
7
6
|
exports.abstractTestnet = (0, defineChain_js_1.defineChain)({
|
8
7
|
...chainConfig_js_1.chainConfig,
|
9
8
|
id: 11_124,
|
@@ -29,36 +28,5 @@ exports.abstractTestnet = (0, defineChain_js_1.defineChain)({
|
|
29
28
|
blockCreated: 358349,
|
30
29
|
},
|
31
30
|
},
|
32
|
-
custom: {
|
33
|
-
getEip712Domain(transaction) {
|
34
|
-
const message = (0, getEip712Domain_js_1.transactionToMessage)(transaction);
|
35
|
-
return {
|
36
|
-
domain: {
|
37
|
-
name: 'Abstract',
|
38
|
-
version: '2',
|
39
|
-
chainId: transaction.chainId,
|
40
|
-
},
|
41
|
-
types: {
|
42
|
-
Transaction: [
|
43
|
-
{ name: 'txType', type: 'uint256' },
|
44
|
-
{ name: 'from', type: 'uint256' },
|
45
|
-
{ name: 'to', type: 'uint256' },
|
46
|
-
{ name: 'gasLimit', type: 'uint256' },
|
47
|
-
{ name: 'gasPerPubdataByteLimit', type: 'uint256' },
|
48
|
-
{ name: 'maxFeePerGas', type: 'uint256' },
|
49
|
-
{ name: 'maxPriorityFeePerGas', type: 'uint256' },
|
50
|
-
{ name: 'paymaster', type: 'uint256' },
|
51
|
-
{ name: 'nonce', type: 'uint256' },
|
52
|
-
{ name: 'value', type: 'uint256' },
|
53
|
-
{ name: 'data', type: 'bytes' },
|
54
|
-
{ name: 'factoryDeps', type: 'bytes32[]' },
|
55
|
-
{ name: 'paymasterInput', type: 'bytes' },
|
56
|
-
],
|
57
|
-
},
|
58
|
-
primaryType: 'Transaction',
|
59
|
-
message: message,
|
60
|
-
};
|
61
|
-
},
|
62
|
-
},
|
63
31
|
});
|
64
32
|
//# sourceMappingURL=abstractTestnet.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"abstractTestnet.js","sourceRoot":"","sources":["../../../chains/definitions/abstractTestnet.ts"],"names":[],"mappings":";;;AAAA,qEAA8D;AAC9D,gEAAyD;
|
1
|
+
{"version":3,"file":"abstractTestnet.js","sourceRoot":"","sources":["../../../chains/definitions/abstractTestnet.ts"],"names":[],"mappings":";;;AAAA,qEAA8D;AAC9D,gEAAyD;AAE5C,QAAA,eAAe,GAAiB,IAAA,4BAAW,EAAC;IACvD,GAAG,4BAAW;IACd,EAAE,EAAE,MAAM;IACV,IAAI,EAAE,kBAAkB;IACxB,cAAc,EAAE;QACd,QAAQ,EAAE,EAAE;QACZ,IAAI,EAAE,KAAK;QACX,MAAM,EAAE,KAAK;KACd;IACD,OAAO,EAAE;QACP,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,6BAA6B,CAAC,EAAE;KACnD;IACD,cAAc,EAAE;QACd,OAAO,EAAE;YACP,IAAI,EAAE,yBAAyB;YAC/B,GAAG,EAAE,kCAAkC;SACxC;KACF;IACD,OAAO,EAAE,IAAI;IACb,SAAS,EAAE;QACT,UAAU,EAAE;YACV,OAAO,EAAE,4CAA4C;YACrD,YAAY,EAAE,MAAM;SACrB;KACF;CACF,CAAC,CAAA"}
|
package/_cjs/errors/version.js
CHANGED
@@ -75,7 +75,7 @@ function includesArgs(parameters) {
|
|
75
75
|
}
|
76
76
|
if (Array.isArray(args) && Array.isArray(matchArgs)) {
|
77
77
|
return matchArgs.every((value, index) => {
|
78
|
-
if (
|
78
|
+
if (value === null)
|
79
79
|
return true;
|
80
80
|
const input = inputs[index];
|
81
81
|
if (!input)
|
@@ -89,7 +89,7 @@ function includesArgs(parameters) {
|
|
89
89
|
typeof matchArgs === 'object' &&
|
90
90
|
!Array.isArray(matchArgs))
|
91
91
|
return Object.entries(matchArgs).every(([key, value]) => {
|
92
|
-
if (
|
92
|
+
if (value === null)
|
93
93
|
return true;
|
94
94
|
const input = inputs.find((input) => input.name === key);
|
95
95
|
if (!input)
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"parseEventLogs.js","sourceRoot":"","sources":["../../../utils/abi/parseEventLogs.ts"],"names":[],"mappings":";;AAiGA,wCAwEC;AAtKD,gDAI4B;AAK5B,oEAA6D;AAC7D,uDAAgD;AAChD,uDAAgD;AAChD,mEAA4D;AAC5D,2DAG4B;AA8E5B,SAAgB,cAAc,CAQ5B,UAA4D;IAE5D,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,UAAU,CAAA;IAErD,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE;QACtB,IAAI,CAAC,UAAU,CAAC,SAAS;YAAE,OAAO,SAAS,CAAA;QAC3C,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC;YAAE,OAAO,UAAU,CAAC,SAAS,CAAA;QACpE,OAAO,CAAC,UAAU,CAAC,SAAmB,CAAC,CAAA;IACzC,CAAC,CAAC,EAAE,CAAA;IAEJ,OAAO,IAAI;SACR,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,IAAI,CAAC;YACH,MAAM,OAAO,GAAI,GAAW,CAAC,IAAI,CAC/B,CAAC,OAAO,EAAE,EAAE,CACV,OAAO,CAAC,IAAI,KAAK,OAAO;gBACxB,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,IAAA,oCAAe,EAAC,OAAO,CAAC,CACjC,CAAA;YACb,IAAI,CAAC,OAAO;gBAAE,OAAO,IAAI,CAAA;YAEzB,MAAM,KAAK,GAAG,IAAA,kCAAc,EAAC;gBAC3B,GAAG,GAAG;gBACN,GAAG,EAAE,CAAC,OAAO,CAAC;gBACd,MAAM;aACP,CAAC,CAAA;YAGF,IAAI,SAAS,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC;gBAAE,OAAO,IAAI,CAAA;YAGlE,IACE,CAAC,YAAY,CAAC;gBACZ,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,SAAS,EAAE,IAAI;aAChB,CAAC;gBAEF,OAAO,IAAI,CAAA;YAEb,OAAO,EAAE,GAAG,KAAK,EAAE,GAAG,GAAG,EAAE,CAAA;QAC7B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,SAA6B,CAAA;YACjC,IAAI,SAA8B,CAAA;YAElC,IAAI,GAAG,YAAY,uCAA8B;gBAAE,OAAO,IAAI,CAAA;YAC9D,IACE,GAAG,YAAY,8BAAqB;gBACpC,GAAG,YAAY,gCAAuB,EACtC,CAAC;gBAED,IAAI,MAAM;oBAAE,OAAO,IAAI,CAAA;gBACvB,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAA;gBAC5B,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;YACvE,CAAC;YAGD,OAAO,EAAE,GAAG,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,CAAA;QACzD,CAAC;IACH,CAAC,CAAC;SACD,MAAM,CAAC,OAAO,CAIhB,CAAA;AACH,CAAC;AAED,SAAS,YAAY,CAAC,UAIrB;IACC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,UAAU,CAAA;IAE9C,IAAI,CAAC,SAAS;QAAE,OAAO,IAAI,CAAA;IAC3B,IAAI,CAAC,IAAI;QAAE,OAAO,KAAK,CAAA;IAEvB,SAAS,OAAO,CAAC,KAAwB,EAAE,KAAc,EAAE,GAAY;QACrE,IAAI,CAAC;YACH,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS;gBAC1B,OAAO,IAAA,kCAAc,EAAC,KAAgB,EAAE,GAAc,CAAC,CAAA;YACzD,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;gBACnD,OAAO,IAAA,wBAAS,EAAC,IAAA,oBAAO,EAAC,KAAe,CAAC,CAAC,KAAK,GAAG,CAAA;YACpD,OAAO,KAAK,KAAK,GAAG,CAAA;QACtB,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAA;QACd,CAAC;IACH,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QACpD,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YACtC,IAAI,
|
1
|
+
{"version":3,"file":"parseEventLogs.js","sourceRoot":"","sources":["../../../utils/abi/parseEventLogs.ts"],"names":[],"mappings":"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"}
|
@@ -1,7 +1,6 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.getEip712Domain = void 0;
|
4
|
-
exports.transactionToMessage = transactionToMessage;
|
5
4
|
const toHex_js_1 = require("../../utils/encoding/toHex.js");
|
6
5
|
const number_js_1 = require("../constants/number.js");
|
7
6
|
const assertEip712Transaction_js_1 = require("./assertEip712Transaction.js");
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getEip712Domain.js","sourceRoot":"","sources":["../../../zksync/utils/getEip712Domain.ts"],"names":[],"mappings":";;;
|
1
|
+
{"version":3,"file":"getEip712Domain.js","sourceRoot":"","sources":["../../../zksync/utils/getEip712Domain.ts"],"names":[],"mappings":"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"}
|
@@ -1,6 +1,5 @@
|
|
1
1
|
import { defineChain } from '../../utils/chain/defineChain.js';
|
2
2
|
import { chainConfig } from '../../zksync/chainConfig.js';
|
3
|
-
import { transactionToMessage } from '../../zksync/utils/getEip712Domain.js';
|
4
3
|
export const abstractTestnet = /*#__PURE__*/ defineChain({
|
5
4
|
...chainConfig,
|
6
5
|
id: 11_124,
|
@@ -26,36 +25,5 @@ export const abstractTestnet = /*#__PURE__*/ defineChain({
|
|
26
25
|
blockCreated: 358349,
|
27
26
|
},
|
28
27
|
},
|
29
|
-
custom: {
|
30
|
-
getEip712Domain(transaction) {
|
31
|
-
const message = transactionToMessage(transaction);
|
32
|
-
return {
|
33
|
-
domain: {
|
34
|
-
name: 'Abstract', // Use 'Abstract' rather than 'zkSync'
|
35
|
-
version: '2',
|
36
|
-
chainId: transaction.chainId,
|
37
|
-
},
|
38
|
-
types: {
|
39
|
-
Transaction: [
|
40
|
-
{ name: 'txType', type: 'uint256' },
|
41
|
-
{ name: 'from', type: 'uint256' },
|
42
|
-
{ name: 'to', type: 'uint256' },
|
43
|
-
{ name: 'gasLimit', type: 'uint256' },
|
44
|
-
{ name: 'gasPerPubdataByteLimit', type: 'uint256' },
|
45
|
-
{ name: 'maxFeePerGas', type: 'uint256' },
|
46
|
-
{ name: 'maxPriorityFeePerGas', type: 'uint256' },
|
47
|
-
{ name: 'paymaster', type: 'uint256' },
|
48
|
-
{ name: 'nonce', type: 'uint256' },
|
49
|
-
{ name: 'value', type: 'uint256' },
|
50
|
-
{ name: 'data', type: 'bytes' },
|
51
|
-
{ name: 'factoryDeps', type: 'bytes32[]' },
|
52
|
-
{ name: 'paymasterInput', type: 'bytes' },
|
53
|
-
],
|
54
|
-
},
|
55
|
-
primaryType: 'Transaction',
|
56
|
-
message: message,
|
57
|
-
};
|
58
|
-
},
|
59
|
-
},
|
60
28
|
});
|
61
29
|
//# sourceMappingURL=abstractTestnet.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"abstractTestnet.js","sourceRoot":"","sources":["../../../chains/definitions/abstractTestnet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAEzD,
|
1
|
+
{"version":3,"file":"abstractTestnet.js","sourceRoot":"","sources":["../../../chains/definitions/abstractTestnet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAEzD,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,CAAC,WAAW,CAAC;IACvD,GAAG,WAAW;IACd,EAAE,EAAE,MAAM;IACV,IAAI,EAAE,kBAAkB;IACxB,cAAc,EAAE;QACd,QAAQ,EAAE,EAAE;QACZ,IAAI,EAAE,KAAK;QACX,MAAM,EAAE,KAAK;KACd;IACD,OAAO,EAAE;QACP,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,6BAA6B,CAAC,EAAE;KACnD;IACD,cAAc,EAAE;QACd,OAAO,EAAE;YACP,IAAI,EAAE,yBAAyB;YAC/B,GAAG,EAAE,kCAAkC;SACxC;KACF;IACD,OAAO,EAAE,IAAI;IACb,SAAS,EAAE;QACT,UAAU,EAAE;YACV,OAAO,EAAE,4CAA4C;YACrD,YAAY,EAAE,MAAM;SACrB;KACF;CACF,CAAC,CAAA"}
|
package/_esm/errors/version.js
CHANGED
@@ -1,2 +1,2 @@
|
|
1
|
-
export const version = '2.21.
|
1
|
+
export const version = '2.21.8';
|
2
2
|
//# sourceMappingURL=version.js.map
|
@@ -101,7 +101,7 @@ function includesArgs(parameters) {
|
|
101
101
|
}
|
102
102
|
if (Array.isArray(args) && Array.isArray(matchArgs)) {
|
103
103
|
return matchArgs.every((value, index) => {
|
104
|
-
if (
|
104
|
+
if (value === null)
|
105
105
|
return true;
|
106
106
|
const input = inputs[index];
|
107
107
|
if (!input)
|
@@ -115,7 +115,7 @@ function includesArgs(parameters) {
|
|
115
115
|
typeof matchArgs === 'object' &&
|
116
116
|
!Array.isArray(matchArgs))
|
117
117
|
return Object.entries(matchArgs).every(([key, value]) => {
|
118
|
-
if (
|
118
|
+
if (value === null)
|
119
119
|
return true;
|
120
120
|
const input = inputs.find((input) => input.name === key);
|
121
121
|
if (!input)
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"parseEventLogs.js","sourceRoot":"","sources":["../../../utils/abi/parseEventLogs.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"parseEventLogs.js","sourceRoot":"","sources":["../../../utils/abi/parseEventLogs.ts"],"names":[],"mappings":"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"}
|
@@ -34,7 +34,7 @@ export const getEip712Domain = (transaction) => {
|
|
34
34
|
};
|
35
35
|
//////////////////////////////////////////////////////////////////////////////
|
36
36
|
// Utilities
|
37
|
-
|
37
|
+
function transactionToMessage(transaction) {
|
38
38
|
const { gas, nonce, to, from, value, maxFeePerGas, maxPriorityFeePerGas, factoryDeps, paymaster, paymasterInput, gasPerPubdata, data, } = transaction;
|
39
39
|
return {
|
40
40
|
txType: 113n,
|
@@ -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,
|
1
|
+
{"version":3,"file":"getEip712Domain.js","sourceRoot":"","sources":["../../../zksync/utils/getEip712Domain.ts"],"names":[],"mappings":"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"}
|
@@ -1,4 +1,3 @@
|
|
1
|
-
import type { ZksyncTransactionSerializableEIP712 } from '../../zksync/types/transaction.js';
|
2
1
|
export declare const abstractTestnet: {
|
3
2
|
blockExplorers: {
|
4
3
|
readonly default: {
|
@@ -27,21 +26,7 @@ export declare const abstractTestnet: {
|
|
27
26
|
sourceId?: number | undefined;
|
28
27
|
testnet: true;
|
29
28
|
custom: {
|
30
|
-
readonly getEip712Domain: (
|
31
|
-
domain: {
|
32
|
-
name: string;
|
33
|
-
version: string;
|
34
|
-
chainId: number;
|
35
|
-
};
|
36
|
-
types: {
|
37
|
-
Transaction: {
|
38
|
-
name: string;
|
39
|
-
type: string;
|
40
|
-
}[];
|
41
|
-
};
|
42
|
-
primaryType: string;
|
43
|
-
message: import("../../zksync/types/transaction.js").ZksyncEIP712TransactionSignable;
|
44
|
-
};
|
29
|
+
readonly getEip712Domain: import("../../zksync/index.js").EIP712DomainFn<import("../index.js").ZkSyncTransactionSerializable, import("../index.js").ZkSyncEIP712TransactionSignable>;
|
45
30
|
};
|
46
31
|
fees?: import("../../index.js").ChainFees<undefined> | undefined;
|
47
32
|
formatters: {
|
@@ -70,7 +55,7 @@ export declare const abstractTestnet: {
|
|
70
55
|
stateRoot: import("../../index.js").Hash;
|
71
56
|
timestamp: bigint;
|
72
57
|
totalDifficulty: bigint | null;
|
73
|
-
transactions: `0x${string}`[] | import("
|
58
|
+
transactions: `0x${string}`[] | import("../index.js").ZkSyncTransaction<boolean>[];
|
74
59
|
transactionsRoot: import("../../index.js").Hash;
|
75
60
|
uncles: import("../../index.js").Hash[];
|
76
61
|
withdrawals?: import("../../index.js").Withdrawal[] | undefined;
|
@@ -82,7 +67,7 @@ export declare const abstractTestnet: {
|
|
82
67
|
};
|
83
68
|
readonly transaction: {
|
84
69
|
exclude: [] | undefined;
|
85
|
-
format: (args: import("
|
70
|
+
format: (args: import("../index.js").ZkSyncRpcTransaction) => ({
|
86
71
|
r: import("../../index.js").Hex;
|
87
72
|
s: import("../../index.js").Hex;
|
88
73
|
v: bigint;
|
@@ -268,8 +253,8 @@ export declare const abstractTestnet: {
|
|
268
253
|
};
|
269
254
|
readonly transactionReceipt: {
|
270
255
|
exclude: [] | undefined;
|
271
|
-
format: (args: import("
|
272
|
-
type: import("
|
256
|
+
format: (args: import("../index.js").ZkSyncRpcTransactionReceipt) => {
|
257
|
+
type: import("../index.js").ZkSyncTransactionType;
|
273
258
|
to: import("abitype").Address | null;
|
274
259
|
from: import("abitype").Address;
|
275
260
|
blockHash: import("../../index.js").Hash;
|
@@ -294,7 +279,7 @@ export declare const abstractTestnet: {
|
|
294
279
|
};
|
295
280
|
readonly transactionRequest: {
|
296
281
|
exclude: ("paymaster" | "gasPerPubdata" | "factoryDeps" | "paymasterInput" | "customSignature")[] | undefined;
|
297
|
-
format: (args: import("
|
282
|
+
format: (args: import("../index.js").ZkSyncTransactionRequest) => ({
|
298
283
|
data?: import("../../index.js").Hex | undefined;
|
299
284
|
from: import("abitype").Address;
|
300
285
|
gas?: `0x${string}` | undefined;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"abstractTestnet.d.ts","sourceRoot":"","sources":["../../../chains/definitions/abstractTestnet.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"abstractTestnet.d.ts","sourceRoot":"","sources":["../../../chains/definitions/abstractTestnet.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyB1B,CAAA"}
|
@@ -1,2 +1,2 @@
|
|
1
|
-
export declare const version = "2.21.
|
1
|
+
export declare const version = "2.21.8";
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
@@ -1,5 +1,4 @@
|
|
1
1
|
import type { EIP712DomainFn } from '../types/eip712.js';
|
2
|
-
import type { ZksyncEIP712TransactionSignable, ZksyncTransactionSerializable
|
2
|
+
import type { ZksyncEIP712TransactionSignable, ZksyncTransactionSerializable } from '../types/transaction.js';
|
3
3
|
export declare const getEip712Domain: EIP712DomainFn<ZksyncTransactionSerializable, ZksyncEIP712TransactionSignable>;
|
4
|
-
export declare function transactionToMessage(transaction: ZksyncTransactionSerializableEIP712): ZksyncEIP712TransactionSignable;
|
5
4
|
//# sourceMappingURL=getEip712Domain.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getEip712Domain.d.ts","sourceRoot":"","sources":["../../../zksync/utils/getEip712Domain.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,KAAK,EACV,+BAA+B,EAC/B,6BAA6B,
|
1
|
+
{"version":3,"file":"getEip712Domain.d.ts","sourceRoot":"","sources":["../../../zksync/utils/getEip712Domain.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,KAAK,EACV,+BAA+B,EAC/B,6BAA6B,EAE9B,MAAM,yBAAyB,CAAA;AAIhC,eAAO,MAAM,eAAe,EAAE,cAAc,CAC1C,6BAA6B,EAC7B,+BAA+B,CAkChC,CAAA"}
|
@@ -1,7 +1,5 @@
|
|
1
1
|
import { defineChain } from '../../utils/chain/defineChain.js'
|
2
2
|
import { chainConfig } from '../../zksync/chainConfig.js'
|
3
|
-
import type { ZksyncTransactionSerializableEIP712 } from '../../zksync/types/transaction.js'
|
4
|
-
import { transactionToMessage } from '../../zksync/utils/getEip712Domain.js'
|
5
3
|
|
6
4
|
export const abstractTestnet = /*#__PURE__*/ defineChain({
|
7
5
|
...chainConfig,
|
@@ -28,36 +26,4 @@ export const abstractTestnet = /*#__PURE__*/ defineChain({
|
|
28
26
|
blockCreated: 358349,
|
29
27
|
},
|
30
28
|
},
|
31
|
-
custom: {
|
32
|
-
getEip712Domain(transaction: ZksyncTransactionSerializableEIP712) {
|
33
|
-
const message = transactionToMessage(transaction)
|
34
|
-
|
35
|
-
return {
|
36
|
-
domain: {
|
37
|
-
name: 'Abstract', // Use 'Abstract' rather than 'zkSync'
|
38
|
-
version: '2',
|
39
|
-
chainId: transaction.chainId,
|
40
|
-
},
|
41
|
-
types: {
|
42
|
-
Transaction: [
|
43
|
-
{ name: 'txType', type: 'uint256' },
|
44
|
-
{ name: 'from', type: 'uint256' },
|
45
|
-
{ name: 'to', type: 'uint256' },
|
46
|
-
{ name: 'gasLimit', type: 'uint256' },
|
47
|
-
{ name: 'gasPerPubdataByteLimit', type: 'uint256' },
|
48
|
-
{ name: 'maxFeePerGas', type: 'uint256' },
|
49
|
-
{ name: 'maxPriorityFeePerGas', type: 'uint256' },
|
50
|
-
{ name: 'paymaster', type: 'uint256' },
|
51
|
-
{ name: 'nonce', type: 'uint256' },
|
52
|
-
{ name: 'value', type: 'uint256' },
|
53
|
-
{ name: 'data', type: 'bytes' },
|
54
|
-
{ name: 'factoryDeps', type: 'bytes32[]' },
|
55
|
-
{ name: 'paymasterInput', type: 'bytes' },
|
56
|
-
],
|
57
|
-
},
|
58
|
-
primaryType: 'Transaction',
|
59
|
-
message: message,
|
60
|
-
}
|
61
|
-
},
|
62
|
-
},
|
63
29
|
})
|
package/errors/version.ts
CHANGED
@@ -1 +1 @@
|
|
1
|
-
export const version = '2.21.
|
1
|
+
export const version = '2.21.8'
|
package/package.json
CHANGED
@@ -193,7 +193,7 @@ function includesArgs(parameters: {
|
|
193
193
|
|
194
194
|
if (Array.isArray(args) && Array.isArray(matchArgs)) {
|
195
195
|
return matchArgs.every((value, index) => {
|
196
|
-
if (
|
196
|
+
if (value === null) return true
|
197
197
|
const input = inputs[index]
|
198
198
|
if (!input) return false
|
199
199
|
const value_ = Array.isArray(value) ? value : [value]
|
@@ -208,7 +208,7 @@ function includesArgs(parameters: {
|
|
208
208
|
!Array.isArray(matchArgs)
|
209
209
|
)
|
210
210
|
return Object.entries(matchArgs).every(([key, value]) => {
|
211
|
-
if (
|
211
|
+
if (value === null) return true
|
212
212
|
const input = inputs.find((input) => input.name === key)
|
213
213
|
if (!input) return false
|
214
214
|
const value_ = Array.isArray(value) ? value : [value]
|
@@ -50,7 +50,7 @@ export const getEip712Domain: EIP712DomainFn<
|
|
50
50
|
//////////////////////////////////////////////////////////////////////////////
|
51
51
|
// Utilities
|
52
52
|
|
53
|
-
|
53
|
+
function transactionToMessage(
|
54
54
|
transaction: ZksyncTransactionSerializableEIP712,
|
55
55
|
): ZksyncEIP712TransactionSignable {
|
56
56
|
const {
|