viem 0.0.0-main.20231026T205555 → 0.0.0-main.20231026T214025
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/_cjs/chains/definitions/zkSync.js +2 -0
- package/_cjs/chains/definitions/zkSync.js.map +1 -1
- package/_cjs/chains/definitions/zkSyncTestnet.js +2 -0
- package/_cjs/chains/definitions/zkSyncTestnet.js.map +1 -1
- package/_cjs/chains/zksync/formatters.js +4 -5
- package/_cjs/chains/zksync/formatters.js.map +1 -1
- package/_cjs/chains/zksync/serializers.js +74 -0
- package/_cjs/chains/zksync/serializers.js.map +1 -0
- package/_cjs/errors/version.js +1 -1
- package/_esm/chains/definitions/zkSync.js +2 -0
- package/_esm/chains/definitions/zkSync.js.map +1 -1
- package/_esm/chains/definitions/zkSyncTestnet.js +2 -0
- package/_esm/chains/definitions/zkSyncTestnet.js.map +1 -1
- package/_esm/chains/zksync/formatters.js +4 -5
- package/_esm/chains/zksync/formatters.js.map +1 -1
- package/_esm/chains/zksync/serializers.js +71 -0
- package/_esm/chains/zksync/serializers.js.map +1 -0
- package/_esm/errors/version.js +1 -1
- package/_types/chains/definitions/zkSync.d.ts +56 -6
- package/_types/chains/definitions/zkSync.d.ts.map +1 -1
- package/_types/chains/definitions/zkSyncTestnet.d.ts +56 -6
- package/_types/chains/definitions/zkSyncTestnet.d.ts.map +1 -1
- package/_types/chains/utils/index.d.ts +1 -1
- package/_types/chains/utils/index.d.ts.map +1 -1
- package/_types/chains/zksync/formatters.d.ts +57 -7
- package/_types/chains/zksync/formatters.d.ts.map +1 -1
- package/_types/chains/zksync/serializers.d.ts +9 -0
- package/_types/chains/zksync/serializers.d.ts.map +1 -0
- package/_types/chains/zksync/types.d.ts +35 -23
- package/_types/chains/zksync/types.d.ts.map +1 -1
- package/_types/errors/version.d.ts +1 -1
- package/chains/definitions/zkSync.ts +2 -0
- package/chains/definitions/zkSyncTestnet.ts +2 -0
- package/chains/utils/index.ts +18 -1
- package/chains/zksync/formatters.ts +8 -9
- package/chains/zksync/serializers.ts +124 -0
- package/chains/zksync/types.ts +55 -25
- package/errors/version.ts +1 -1
- package/package.json +1 -1
@@ -5,5 +5,5 @@ export type { CeloBlock, CeloBlockOverrides, CeloRpcBlock, CeloRpcBlockOverrides
|
|
5
5
|
export { formattersOptimism } from '../optimism/formatters.js';
|
6
6
|
export type { OptimismBlock, OptimismBlockOverrides, OptimismDepositTransaction, OptimismRpcBlock, OptimismRpcBlockOverrides, OptimismRpcDepositTransaction, OptimismRpcTransaction, OptimismRpcTransactionReceipt, OptimismRpcTransactionReceiptOverrides, OptimismTransaction, OptimismTransactionReceipt, OptimismTransactionReceiptOverrides, } from '../optimism/types.js';
|
7
7
|
export { formattersZkSync } from '../zksync/formatters.js';
|
8
|
-
export type {
|
8
|
+
export type { ZkSyncBlock, ZkSyncBlockOverrides, ZkSyncEip712Meta, ZkSyncFeeValues, ZkSyncL2ToL1Log, ZkSyncLog, ZkSyncRpcBlock, ZkSyncRpcBlockOverrides, ZkSyncRpcL2ToL1Log, ZkSyncRpcLog, ZkSyncRpcTransaction, ZkSyncRpcTransactionEIP712, ZkSyncRpcTransactionPriority, ZkSyncRpcTransactionReceiptOverrides, ZkSyncRpcTransactionRequest, ZkSyncRpcTransactionRequestEIP712, ZkSyncTransaction, ZkSyncTransactionEIP712, ZkSyncTransactionReceipt, ZkSyncTransactionReceiptOverrides, ZkSyncTransactionRequest, ZkSyncTransactionRequestEIP712, ZkSyncTransactionSerializable, ZkSyncTransactionSerializableEIP712, ZkSyncTransactionSerialized, ZkSyncTransactionSerializedEIP712, ZkSyncTransactionType, } from '../zksync/types.js';
|
9
9
|
//# sourceMappingURL=index.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../chains/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EACL,wBAAwB,EACxB,eAAe,GAChB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAA;AACzD,YAAY,EACV,SAAS,EACT,kBAAkB,EAClB,YAAY,EACZ,qBAAqB,EACrB,kBAAkB,EAClB,yBAAyB,EACzB,kCAAkC,EAClC,yBAAyB,EACzB,eAAe,EACf,sBAAsB,EACtB,+BAA+B,EAC/B,sBAAsB,EACtB,2BAA2B,EAC3B,yBAAyB,EACzB,mBAAmB,EACnB,mBAAmB,EACnB,0BAA0B,EAC1B,gBAAgB,EAChB,uBAAuB,EACvB,4BAA4B,EAC5B,0BAA0B,GAC3B,MAAM,kBAAkB,CAAA;AAEzB,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAC9D,YAAY,EACV,aAAa,EACb,sBAAsB,EACtB,0BAA0B,EAC1B,gBAAgB,EAChB,yBAAyB,EACzB,6BAA6B,EAC7B,sBAAsB,EACtB,6BAA6B,EAC7B,sCAAsC,EACtC,mBAAmB,EACnB,0BAA0B,EAC1B,mCAAmC,GACpC,MAAM,sBAAsB,CAAA;AAE7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,YAAY,EACV,
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../chains/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EACL,wBAAwB,EACxB,eAAe,GAChB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAA;AACzD,YAAY,EACV,SAAS,EACT,kBAAkB,EAClB,YAAY,EACZ,qBAAqB,EACrB,kBAAkB,EAClB,yBAAyB,EACzB,kCAAkC,EAClC,yBAAyB,EACzB,eAAe,EACf,sBAAsB,EACtB,+BAA+B,EAC/B,sBAAsB,EACtB,2BAA2B,EAC3B,yBAAyB,EACzB,mBAAmB,EACnB,mBAAmB,EACnB,0BAA0B,EAC1B,gBAAgB,EAChB,uBAAuB,EACvB,4BAA4B,EAC5B,0BAA0B,GAC3B,MAAM,kBAAkB,CAAA;AAEzB,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAC9D,YAAY,EACV,aAAa,EACb,sBAAsB,EACtB,0BAA0B,EAC1B,gBAAgB,EAChB,yBAAyB,EACzB,6BAA6B,EAC7B,sBAAsB,EACtB,6BAA6B,EAC7B,sCAAsC,EACtC,mBAAmB,EACnB,0BAA0B,EAC1B,mCAAmC,GACpC,MAAM,sBAAsB,CAAA;AAE7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,YAAY,EACV,WAAW,EACX,oBAAoB,EACpB,gBAAgB,EAChB,eAAe,EACf,eAAe,EACf,SAAS,EACT,cAAc,EACd,uBAAuB,EACvB,kBAAkB,EAClB,YAAY,EACZ,oBAAoB,EACpB,0BAA0B,EAC1B,4BAA4B,EAC5B,oCAAoC,EACpC,2BAA2B,EAC3B,iCAAiC,EACjC,iBAAiB,EACjB,uBAAuB,EACvB,wBAAwB,EACxB,iCAAiC,EACjC,wBAAwB,EACxB,8BAA8B,EAC9B,6BAA6B,EAC7B,mCAAmC,EACnC,2BAA2B,EAC3B,iCAAiC,EACjC,qBAAqB,GACtB,MAAM,oBAAoB,CAAA"}
|
@@ -1,5 +1,5 @@
|
|
1
1
|
import type { Hash } from '../../types/misc.js';
|
2
|
-
import type {
|
2
|
+
import type { ZkSyncL2ToL1Log, ZkSyncLog, ZkSyncRpcBlockOverrides, ZkSyncRpcTransaction, ZkSyncRpcTransactionReceiptOverrides, ZkSyncTransaction, ZkSyncTransactionRequest } from './types.js';
|
3
3
|
export declare const formattersZkSync: {
|
4
4
|
readonly block: {
|
5
5
|
exclude: [] | undefined;
|
@@ -37,7 +37,57 @@ export declare const formattersZkSync: {
|
|
37
37
|
};
|
38
38
|
readonly transaction: {
|
39
39
|
exclude: [] | undefined;
|
40
|
-
format: (args: (import("../../types/utils.js").Assign_<Partial<Omit<import("../../index.js").TransactionLegacy<`0x${string}`, `0x${string}`, boolean, "0x0">, "typeHex">>, ZkSyncRpcTransaction> & Omit<import("
|
40
|
+
format: (args: (import("../../types/utils.js").Assign_<Partial<Omit<import("../../index.js").TransactionLegacy<`0x${string}`, `0x${string}`, boolean, "0x0">, "typeHex">>, ZkSyncRpcTransaction> & Omit<import("../../index.js").TransactionBase<`0x${string}`, `0x${string}`, boolean> & import("../../index.js").FeeValuesLegacy<`0x${string}`> & {
|
41
|
+
accessList?: undefined;
|
42
|
+
chainId?: `0x${string}` | undefined;
|
43
|
+
type: "0x0";
|
44
|
+
} & {
|
45
|
+
l1BatchNumber: `0x${string}`;
|
46
|
+
l1BatchTxIndex: `0x${string}`;
|
47
|
+
}, "typeHex">) | (import("../../types/utils.js").Assign_<Partial<Omit<import("../../index.js").TransactionLegacy<`0x${string}`, `0x${string}`, boolean, "0x0">, "typeHex">>, ZkSyncRpcTransaction> & Omit<import("../../index.js").TransactionBase<`0x${string}`, `0x${string}`, boolean> & import("./types.js").ZkSyncFeeValues<`0x${string}`> & {
|
48
|
+
l1BatchNumber: `0x${string}`;
|
49
|
+
l1BatchTxIndex: `0x${string}`;
|
50
|
+
} & {
|
51
|
+
type: "0x2";
|
52
|
+
}, "typeHex">) | (import("../../types/utils.js").Assign_<Partial<Omit<import("../../index.js").TransactionLegacy<`0x${string}`, `0x${string}`, boolean, "0x0">, "typeHex">>, ZkSyncRpcTransaction> & Omit<import("./types.js").ZkSyncRpcTransactionPriority<boolean>, "typeHex">) | (import("../../types/utils.js").Assign_<Partial<Omit<import("../../index.js").TransactionLegacy<`0x${string}`, `0x${string}`, boolean, "0x0">, "typeHex">>, ZkSyncRpcTransaction> & Omit<import("./types.js").ZkSyncRpcTransactionEIP712<boolean>, "typeHex">) | (import("../../types/utils.js").Assign_<Partial<Omit<import("../../index.js").TransactionEIP2930<`0x${string}`, `0x${string}`, boolean, "0x1">, "typeHex">>, ZkSyncRpcTransaction> & Omit<import("../../index.js").TransactionBase<`0x${string}`, `0x${string}`, boolean> & import("../../index.js").FeeValuesLegacy<`0x${string}`> & {
|
53
|
+
accessList?: undefined;
|
54
|
+
chainId?: `0x${string}` | undefined;
|
55
|
+
type: "0x0";
|
56
|
+
} & {
|
57
|
+
l1BatchNumber: `0x${string}`;
|
58
|
+
l1BatchTxIndex: `0x${string}`;
|
59
|
+
}, "typeHex">) | (import("../../types/utils.js").Assign_<Partial<Omit<import("../../index.js").TransactionEIP2930<`0x${string}`, `0x${string}`, boolean, "0x1">, "typeHex">>, ZkSyncRpcTransaction> & Omit<import("../../index.js").TransactionBase<`0x${string}`, `0x${string}`, boolean> & import("../../index.js").FeeValuesLegacy<`0x${string}`> & {
|
60
|
+
accessList: import("../../index.js").AccessList;
|
61
|
+
chainId: `0x${string}`;
|
62
|
+
type: "0x1";
|
63
|
+
} & {
|
64
|
+
l1BatchNumber: `0x${string}`;
|
65
|
+
l1BatchTxIndex: `0x${string}`;
|
66
|
+
}, "typeHex">) | (import("../../types/utils.js").Assign_<Partial<Omit<import("../../index.js").TransactionEIP2930<`0x${string}`, `0x${string}`, boolean, "0x1">, "typeHex">>, ZkSyncRpcTransaction> & Omit<import("../../index.js").TransactionBase<`0x${string}`, `0x${string}`, boolean> & import("./types.js").ZkSyncFeeValues<`0x${string}`> & {
|
67
|
+
l1BatchNumber: `0x${string}`;
|
68
|
+
l1BatchTxIndex: `0x${string}`;
|
69
|
+
} & {
|
70
|
+
type: "0x2";
|
71
|
+
}, "typeHex">) | (import("../../types/utils.js").Assign_<Partial<Omit<import("../../index.js").TransactionEIP2930<`0x${string}`, `0x${string}`, boolean, "0x1">, "typeHex">>, ZkSyncRpcTransaction> & Omit<import("./types.js").ZkSyncRpcTransactionPriority<boolean>, "typeHex">) | (import("../../types/utils.js").Assign_<Partial<Omit<import("../../index.js").TransactionEIP2930<`0x${string}`, `0x${string}`, boolean, "0x1">, "typeHex">>, ZkSyncRpcTransaction> & Omit<import("./types.js").ZkSyncRpcTransactionEIP712<boolean>, "typeHex">) | (import("../../types/utils.js").Assign_<Partial<Omit<import("../../index.js").TransactionEIP1559<`0x${string}`, `0x${string}`, boolean, "0x2">, "typeHex">>, ZkSyncRpcTransaction> & Omit<import("../../index.js").TransactionBase<`0x${string}`, `0x${string}`, boolean> & import("../../index.js").FeeValuesLegacy<`0x${string}`> & {
|
72
|
+
accessList?: undefined;
|
73
|
+
chainId?: `0x${string}` | undefined;
|
74
|
+
type: "0x0";
|
75
|
+
} & {
|
76
|
+
l1BatchNumber: `0x${string}`;
|
77
|
+
l1BatchTxIndex: `0x${string}`;
|
78
|
+
}, "typeHex">) | (import("../../types/utils.js").Assign_<Partial<Omit<import("../../index.js").TransactionEIP1559<`0x${string}`, `0x${string}`, boolean, "0x2">, "typeHex">>, ZkSyncRpcTransaction> & Omit<import("../../index.js").TransactionBase<`0x${string}`, `0x${string}`, boolean> & import("../../index.js").FeeValuesLegacy<`0x${string}`> & {
|
79
|
+
accessList: import("../../index.js").AccessList;
|
80
|
+
chainId: `0x${string}`;
|
81
|
+
type: "0x1";
|
82
|
+
} & {
|
83
|
+
l1BatchNumber: `0x${string}`;
|
84
|
+
l1BatchTxIndex: `0x${string}`;
|
85
|
+
}, "typeHex">) | (import("../../types/utils.js").Assign_<Partial<Omit<import("../../index.js").TransactionEIP1559<`0x${string}`, `0x${string}`, boolean, "0x2">, "typeHex">>, ZkSyncRpcTransaction> & Omit<import("../../index.js").TransactionBase<`0x${string}`, `0x${string}`, boolean> & import("./types.js").ZkSyncFeeValues<`0x${string}`> & {
|
86
|
+
l1BatchNumber: `0x${string}`;
|
87
|
+
l1BatchTxIndex: `0x${string}`;
|
88
|
+
} & {
|
89
|
+
type: "0x2";
|
90
|
+
}, "typeHex">) | (import("../../types/utils.js").Assign_<Partial<Omit<import("../../index.js").TransactionEIP1559<`0x${string}`, `0x${string}`, boolean, "0x2">, "typeHex">>, ZkSyncRpcTransaction> & Omit<import("./types.js").ZkSyncRpcTransactionPriority<boolean>, "typeHex">) | (import("../../types/utils.js").Assign_<Partial<Omit<import("../../index.js").TransactionEIP1559<`0x${string}`, `0x${string}`, boolean, "0x2">, "typeHex">>, ZkSyncRpcTransaction> & Omit<import("./types.js").ZkSyncRpcTransactionEIP712<boolean>, "typeHex">)) => ({
|
41
91
|
blockHash: `0x${string}` | null;
|
42
92
|
blockNumber: bigint | null;
|
43
93
|
from: `0x${string}`;
|
@@ -303,7 +353,7 @@ export declare const formattersZkSync: {
|
|
303
353
|
effectiveGasPrice: bigint;
|
304
354
|
from: `0x${string}`;
|
305
355
|
gasUsed: bigint;
|
306
|
-
logs:
|
356
|
+
logs: ZkSyncLog<bigint, number, boolean, undefined, undefined, undefined, undefined>[];
|
307
357
|
logsBloom: `0x${string}`;
|
308
358
|
status: "success" | "reverted";
|
309
359
|
to: `0x${string}` | null;
|
@@ -312,7 +362,7 @@ export declare const formattersZkSync: {
|
|
312
362
|
type: import("../../index.js").TransactionType;
|
313
363
|
l1BatchNumber: bigint | null;
|
314
364
|
l1BatchTxIndex: bigint | null;
|
315
|
-
l2ToL1Logs:
|
365
|
+
l2ToL1Logs: ZkSyncL2ToL1Log[];
|
316
366
|
} & {};
|
317
367
|
type: "transactionReceipt";
|
318
368
|
};
|
@@ -369,7 +419,7 @@ export declare const formattersZkSync: {
|
|
369
419
|
maxPriorityFeePerGas?: `0x${string}` | undefined;
|
370
420
|
accessList?: undefined;
|
371
421
|
type: "0xff" | "0x71";
|
372
|
-
eip712Meta: import("./types.js").
|
422
|
+
eip712Meta: import("./types.js").ZkSyncEip712Meta;
|
373
423
|
} | {
|
374
424
|
data?: `0x${string}` | undefined;
|
375
425
|
from: `0x${string}`;
|
@@ -421,7 +471,7 @@ export declare const formattersZkSync: {
|
|
421
471
|
maxPriorityFeePerGas?: `0x${string}` | undefined;
|
422
472
|
accessList?: import("../../index.js").AccessList | undefined;
|
423
473
|
type: "0xff" | "0x71";
|
424
|
-
eip712Meta: import("./types.js").
|
474
|
+
eip712Meta: import("./types.js").ZkSyncEip712Meta;
|
425
475
|
} | {
|
426
476
|
data?: `0x${string}` | undefined;
|
427
477
|
from: `0x${string}`;
|
@@ -473,7 +523,7 @@ export declare const formattersZkSync: {
|
|
473
523
|
maxPriorityFeePerGas?: `0x${string}` | undefined;
|
474
524
|
accessList?: import("../../index.js").AccessList | undefined;
|
475
525
|
type: "0xff" | "0x71";
|
476
|
-
eip712Meta: import("./types.js").
|
526
|
+
eip712Meta: import("./types.js").ZkSyncEip712Meta;
|
477
527
|
}) & {
|
478
528
|
customSignature: never;
|
479
529
|
factoryDeps: never;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"formatters.d.ts","sourceRoot":"","sources":["../../../chains/zksync/formatters.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAS/C,OAAO,KAAK,
|
1
|
+
{"version":3,"file":"formatters.d.ts","sourceRoot":"","sources":["../../../chains/zksync/formatters.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAS/C,OAAO,KAAK,EAEV,eAAe,EACf,SAAS,EACT,uBAAuB,EACvB,oBAAoB,EACpB,oCAAoC,EAEpC,iBAAiB,EAGjB,wBAAwB,EACzB,MAAM,YAAY,CAAA;AAEnB,eAAO,MAAM,gBAAgB;;;;0BAIP,IAAI,EAAE,GAAG,oBAAoB,EAAE;;;;;;;;;;;;;;;;;;;;;0BAGjC,IAAI,EAAE,GAAG,iBAAiB,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+GZ,CAAA"}
|
@@ -0,0 +1,9 @@
|
|
1
|
+
import { type SerializeTransactionFn } from '../../utils/transaction/serializeTransaction.js';
|
2
|
+
import type { ZkSyncTransactionSerializable, ZkSyncTransactionSerializableEIP712, ZkSyncTransactionSerializedEIP712 } from './types.js';
|
3
|
+
export declare const serializeTransactionZkSync: SerializeTransactionFn<ZkSyncTransactionSerializable>;
|
4
|
+
export declare const serializersZkSync: {
|
5
|
+
readonly transaction: SerializeTransactionFn<ZkSyncTransactionSerializable>;
|
6
|
+
};
|
7
|
+
export type SerializeTransactionEIP712ReturnType = ZkSyncTransactionSerializedEIP712;
|
8
|
+
export declare function assertTransactionEIP712(transaction: ZkSyncTransactionSerializableEIP712): void;
|
9
|
+
//# sourceMappingURL=serializers.d.ts.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"serializers.d.ts","sourceRoot":"","sources":["../../../chains/zksync/serializers.ts"],"names":[],"mappings":"AASA,OAAO,EACL,KAAK,sBAAsB,EAE5B,MAAM,iDAAiD,CAAA;AACxD,OAAO,KAAK,EACV,6BAA6B,EAC7B,mCAAmC,EACnC,iCAAiC,EAClC,MAAM,YAAY,CAAA;AAEnB,eAAO,MAAM,0BAA0B,EAAE,sBAAsB,CAC7D,6BAA6B,CAO9B,CAAA;AAED,eAAO,MAAM,iBAAiB;;CAEO,CAAA;AAKrC,MAAM,MAAM,oCAAoC,GAC9C,iCAAiC,CAAA;AAgEnC,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,mCAAmC,QAqBjD"}
|
@@ -1,18 +1,18 @@
|
|
1
|
-
import type { Address } from 'abitype';
|
1
|
+
import type { Abi, AbiEvent, Address } from 'abitype';
|
2
2
|
import type { Block, BlockTag } from '../../types/block.js';
|
3
3
|
import type { FeeValuesEIP1559 } from '../../types/fee.js';
|
4
4
|
import type { Log as Log_ } from '../../types/log.js';
|
5
5
|
import type { Hex } from '../../types/misc.js';
|
6
6
|
import type { Index, Quantity, RpcBlock, RpcLog as RpcLog_, RpcTransactionRequest as RpcTransactionRequest_, TransactionType } from '../../types/rpc.js';
|
7
|
+
import type { TransactionSerializable, TransactionSerializableEIP1559, TransactionSerialized } from '../../types/transaction.js';
|
7
8
|
import type { Transaction as Transaction_, TransactionBase, TransactionEIP2930, TransactionLegacy, TransactionReceipt, TransactionRequest as TransactionRequest_, TransactionRequestBase } from '../../types/transaction.js';
|
8
9
|
import type { UnionOmit } from '../../types/utils.js';
|
9
|
-
|
10
|
-
export type Log<TQuantity = bigint, TIndex = number, TPending extends boolean = boolean, TAbiEvent extends AbiEvent | undefined = undefined, TStrict extends boolean | undefined = undefined, TAbi extends Abi | readonly unknown[] | undefined = TAbiEvent extends AbiEvent ? [TAbiEvent] : undefined, TEventName extends string | undefined = TAbiEvent extends AbiEvent ? TAbiEvent['name'] : undefined> = Log_<TQuantity, TIndex, TPending, TAbiEvent, TStrict, TAbi, TEventName> & {
|
10
|
+
export type ZkSyncLog<TQuantity = bigint, TIndex = number, TPending extends boolean = boolean, TAbiEvent extends AbiEvent | undefined = undefined, TStrict extends boolean | undefined = undefined, TAbi extends Abi | readonly unknown[] | undefined = TAbiEvent extends AbiEvent ? [TAbiEvent] : undefined, TEventName extends string | undefined = TAbiEvent extends AbiEvent ? TAbiEvent['name'] : undefined> = Log_<TQuantity, TIndex, TPending, TAbiEvent, TStrict, TAbi, TEventName> & {
|
11
11
|
l1BatchNumber: TQuantity;
|
12
12
|
transactionLogIndex: TIndex;
|
13
13
|
logType: Hex | null;
|
14
14
|
};
|
15
|
-
export type
|
15
|
+
export type ZkSyncRpcLog = RpcLog_ & {
|
16
16
|
l1BatchNumber: Hex | null;
|
17
17
|
transactionLogIndex: Hex;
|
18
18
|
logType: Hex | null;
|
@@ -21,13 +21,13 @@ type PaymasterParams = {
|
|
21
21
|
paymaster: Address;
|
22
22
|
paymasterInput: number[];
|
23
23
|
};
|
24
|
-
export type
|
24
|
+
export type ZkSyncEip712Meta = {
|
25
25
|
gasPerPubdata?: Hex;
|
26
26
|
factoryDeps?: Hex[];
|
27
27
|
customSignature?: Hex;
|
28
28
|
paymasterParams?: PaymasterParams;
|
29
29
|
};
|
30
|
-
export type
|
30
|
+
export type ZkSyncL2ToL1Log = {
|
31
31
|
blockNumber: bigint;
|
32
32
|
blockHash: string;
|
33
33
|
l1BatchNumber: bigint;
|
@@ -40,7 +40,7 @@ export type L2ToL1Log = {
|
|
40
40
|
transactionHash: string;
|
41
41
|
logIndex: bigint;
|
42
42
|
};
|
43
|
-
export type
|
43
|
+
export type ZkSyncRpcL2ToL1Log = {
|
44
44
|
blockNumber: Hex;
|
45
45
|
blockHash: Hex;
|
46
46
|
l1BatchNumber: Hex;
|
@@ -77,27 +77,27 @@ type TransactionOverrides = {
|
|
77
77
|
type TransactionPriority<TPending extends boolean = boolean> = TransactionBase<bigint, number, TPending> & TransactionOverrides & FeeValuesEIP1559 & {
|
78
78
|
type: 'priority';
|
79
79
|
};
|
80
|
-
export type
|
80
|
+
export type ZkSyncTransactionEIP712<TPending extends boolean = boolean> = TransactionBase<bigint, number, TPending> & TransactionOverrides & FeeValuesEIP1559 & {
|
81
81
|
type: 'eip712' | 'priority';
|
82
82
|
};
|
83
83
|
type Transaction<TPending extends boolean = boolean> = Transaction_<bigint, number, TPending> & TransactionOverrides;
|
84
|
-
export type ZkSyncTransaction<TPending extends boolean = boolean> = Transaction<TPending> | TransactionPriority<TPending> |
|
84
|
+
export type ZkSyncTransaction<TPending extends boolean = boolean> = Transaction<TPending> | TransactionPriority<TPending> | ZkSyncTransactionEIP712<TPending>;
|
85
85
|
type RpcTransactionOverrides = {
|
86
86
|
l1BatchNumber: Hex;
|
87
87
|
l1BatchTxIndex: Hex;
|
88
88
|
};
|
89
|
-
|
90
|
-
|
91
|
-
|
89
|
+
type RpcTransactionLegacy<TPending extends boolean = boolean> = TransactionLegacy<Quantity, Index, TPending, '0x0'> & RpcTransactionOverrides;
|
90
|
+
type RpcTransactionEIP2930<TPending extends boolean = boolean> = TransactionEIP2930<Quantity, Index, TPending, '0x1'> & RpcTransactionOverrides;
|
91
|
+
type RpcTransactionEIP1559<TPending extends boolean = boolean> = TransactionBase<Quantity, Index, TPending> & ZkSyncFeeValues<Quantity> & RpcTransactionOverrides & {
|
92
92
|
type: '0x2';
|
93
93
|
};
|
94
|
-
export type
|
94
|
+
export type ZkSyncRpcTransactionPriority<TPending extends boolean = boolean> = TransactionBase<Quantity, Index, TPending> & ZkSyncFeeValues<Quantity> & RpcTransactionOverrides & {
|
95
95
|
type: PriorityType;
|
96
96
|
};
|
97
|
-
export type
|
97
|
+
export type ZkSyncRpcTransactionEIP712<TPending extends boolean = boolean> = TransactionBase<Quantity, Index, TPending> & ZkSyncFeeValues<Quantity> & RpcTransactionOverrides & {
|
98
98
|
type: EIP712Type;
|
99
99
|
};
|
100
|
-
export type ZkSyncRpcTransaction<TPending extends boolean = boolean> = UnionOmit<RpcTransactionLegacy<TPending> | RpcTransactionEIP2930<TPending> | RpcTransactionEIP1559<TPending> |
|
100
|
+
export type ZkSyncRpcTransaction<TPending extends boolean = boolean> = UnionOmit<RpcTransactionLegacy<TPending> | RpcTransactionEIP2930<TPending> | RpcTransactionEIP1559<TPending> | ZkSyncRpcTransactionPriority<TPending> | ZkSyncRpcTransactionEIP712<TPending>, 'typeHex'>;
|
101
101
|
type TransactionRequest = TransactionRequest_ & {
|
102
102
|
gasPerPubdata?: undefined;
|
103
103
|
customSignature?: undefined;
|
@@ -109,7 +109,7 @@ export type ZkSyncTransactionRequestEIP712 = Omit<TransactionRequestBase, 'type'
|
|
109
109
|
gasPerPubdata?: bigint;
|
110
110
|
customSignature?: Hex;
|
111
111
|
factoryDeps?: Hex[];
|
112
|
-
type
|
112
|
+
type?: 'eip712' | 'priority';
|
113
113
|
} & ({
|
114
114
|
paymaster: Address;
|
115
115
|
paymasterInput: Hex;
|
@@ -121,25 +121,37 @@ export type ZkSyncTransactionRequest = TransactionRequest | ZkSyncTransactionReq
|
|
121
121
|
type RpcTransactionRequest = RpcTransactionRequest_ & {
|
122
122
|
eip712Meta?: undefined;
|
123
123
|
};
|
124
|
-
export type
|
125
|
-
eip712Meta:
|
124
|
+
export type ZkSyncRpcTransactionRequestEIP712 = TransactionRequestBase<Quantity, Index> & Partial<FeeValuesEIP1559<Quantity>> & {
|
125
|
+
eip712Meta: ZkSyncEip712Meta;
|
126
126
|
type: EIP712Type | PriorityType;
|
127
127
|
};
|
128
|
-
export type ZkSyncRpcTransactionRequest = RpcTransactionRequest |
|
128
|
+
export type ZkSyncRpcTransactionRequest = RpcTransactionRequest | ZkSyncRpcTransactionRequestEIP712;
|
129
129
|
export type ZkSyncTransactionType = TransactionType | 'eip712' | 'priority';
|
130
130
|
export type ZkSyncRpcTransactionReceiptOverrides = {
|
131
131
|
l1BatchNumber: Hex;
|
132
132
|
l1BatchTxIndex: Hex;
|
133
|
-
logs:
|
134
|
-
l2ToL1Logs:
|
133
|
+
logs: ZkSyncRpcLog[];
|
134
|
+
l2ToL1Logs: ZkSyncRpcL2ToL1Log[];
|
135
135
|
root: Hex;
|
136
136
|
};
|
137
137
|
export type ZkSyncTransactionReceiptOverrides = {
|
138
138
|
l1BatchNumber: bigint | null;
|
139
139
|
l1BatchTxIndex: bigint | null;
|
140
|
-
logs:
|
141
|
-
l2ToL1Logs:
|
140
|
+
logs: ZkSyncLog[];
|
141
|
+
l2ToL1Logs: ZkSyncL2ToL1Log[];
|
142
142
|
};
|
143
143
|
export type ZkSyncTransactionReceipt = Omit<TransactionReceipt, 'logs'> & ZkSyncTransactionReceiptOverrides;
|
144
|
+
export type ZkSyncTransactionSerializable = TransactionSerializable | ZkSyncTransactionSerializableEIP712;
|
145
|
+
export type ZkSyncTransactionSerialized<TType extends TransactionType = 'eip712'> = TType extends 'eip712' ? ZkSyncTransactionSerializedEIP712 : TransactionSerialized<TType>;
|
146
|
+
export type ZkSyncTransactionSerializedEIP712 = `0x71${string}`;
|
147
|
+
export type ZkSyncTransactionSerializableEIP712<TQuantity = bigint, TIndex = number> = Omit<TransactionSerializableEIP1559<TQuantity, TIndex>, 'type'> & {
|
148
|
+
from: Hex;
|
149
|
+
gasPerPubdata?: bigint;
|
150
|
+
paymaster?: Address;
|
151
|
+
factoryDeps?: Hex[];
|
152
|
+
paymasterInput?: Hex;
|
153
|
+
customSignature?: Hex;
|
154
|
+
type?: 'eip712';
|
155
|
+
};
|
144
156
|
export {};
|
145
157
|
//# sourceMappingURL=types.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../chains/zksync/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../chains/zksync/types.ts"],"names":[],"mappings":"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"}
|
@@ -1,2 +1,2 @@
|
|
1
|
-
export declare const version = "0.0.0-main.
|
1
|
+
export declare const version = "0.0.0-main.20231026T214025";
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
@@ -1,5 +1,6 @@
|
|
1
1
|
import { defineChain } from '../../utils/chain.js'
|
2
2
|
import { formattersZkSync } from '../zksync/formatters.js'
|
3
|
+
import { serializersZkSync } from '../zksync/serializers.js'
|
3
4
|
|
4
5
|
export const zkSync = /*#__PURE__*/ defineChain(
|
5
6
|
{
|
@@ -34,6 +35,7 @@ export const zkSync = /*#__PURE__*/ defineChain(
|
|
34
35
|
},
|
35
36
|
},
|
36
37
|
{
|
38
|
+
serializers: serializersZkSync,
|
37
39
|
formatters: formattersZkSync,
|
38
40
|
},
|
39
41
|
)
|
@@ -1,5 +1,6 @@
|
|
1
1
|
import { defineChain } from '../../utils/chain.js'
|
2
2
|
import { formattersZkSync } from '../zksync/formatters.js'
|
3
|
+
import { serializersZkSync } from '../zksync/serializers.js'
|
3
4
|
|
4
5
|
export const zkSyncTestnet = /*#__PURE__*/ defineChain(
|
5
6
|
{
|
@@ -31,6 +32,7 @@ export const zkSyncTestnet = /*#__PURE__*/ defineChain(
|
|
31
32
|
testnet: true,
|
32
33
|
},
|
33
34
|
{
|
35
|
+
serializers: serializersZkSync,
|
34
36
|
formatters: formattersZkSync,
|
35
37
|
},
|
36
38
|
)
|
package/chains/utils/index.ts
CHANGED
@@ -46,14 +46,31 @@ export type {
|
|
46
46
|
|
47
47
|
export { formattersZkSync } from '../zksync/formatters.js'
|
48
48
|
export type {
|
49
|
-
TransactionEIP712,
|
50
49
|
ZkSyncBlock,
|
51
50
|
ZkSyncBlockOverrides,
|
51
|
+
ZkSyncEip712Meta,
|
52
|
+
ZkSyncFeeValues,
|
53
|
+
ZkSyncL2ToL1Log,
|
54
|
+
ZkSyncLog,
|
55
|
+
ZkSyncRpcBlock,
|
56
|
+
ZkSyncRpcBlockOverrides,
|
57
|
+
ZkSyncRpcL2ToL1Log,
|
58
|
+
ZkSyncRpcLog,
|
52
59
|
ZkSyncRpcTransaction,
|
60
|
+
ZkSyncRpcTransactionEIP712,
|
61
|
+
ZkSyncRpcTransactionPriority,
|
53
62
|
ZkSyncRpcTransactionReceiptOverrides,
|
54
63
|
ZkSyncRpcTransactionRequest,
|
64
|
+
ZkSyncRpcTransactionRequestEIP712,
|
55
65
|
ZkSyncTransaction,
|
66
|
+
ZkSyncTransactionEIP712,
|
56
67
|
ZkSyncTransactionReceipt,
|
57
68
|
ZkSyncTransactionReceiptOverrides,
|
58
69
|
ZkSyncTransactionRequest,
|
70
|
+
ZkSyncTransactionRequestEIP712,
|
71
|
+
ZkSyncTransactionSerializable,
|
72
|
+
ZkSyncTransactionSerializableEIP712,
|
73
|
+
ZkSyncTransactionSerialized,
|
74
|
+
ZkSyncTransactionSerializedEIP712,
|
75
|
+
ZkSyncTransactionType,
|
59
76
|
} from '../zksync/types.js'
|
@@ -9,9 +9,9 @@ import { defineTransaction } from '../../utils/formatters/transaction.js'
|
|
9
9
|
import { defineTransactionReceipt } from '../../utils/formatters/transactionReceipt.js'
|
10
10
|
import { defineTransactionRequest } from '../../utils/formatters/transactionRequest.js'
|
11
11
|
import type {
|
12
|
-
L2ToL1Log,
|
13
|
-
Log,
|
14
12
|
ZkSyncBlockOverrides,
|
13
|
+
ZkSyncL2ToL1Log,
|
14
|
+
ZkSyncLog,
|
15
15
|
ZkSyncRpcBlockOverrides,
|
16
16
|
ZkSyncRpcTransaction,
|
17
17
|
ZkSyncRpcTransactionReceiptOverrides,
|
@@ -83,7 +83,7 @@ export const formattersZkSync = {
|
|
83
83
|
transactionLogIndex: hexToNumber(log.transactionLogIndex),
|
84
84
|
logType: log.logType,
|
85
85
|
}
|
86
|
-
}) as
|
86
|
+
}) as ZkSyncLog[],
|
87
87
|
l2ToL1Logs: args.l2ToL1Logs.map((l2ToL1Log) => {
|
88
88
|
return {
|
89
89
|
blockNumber: hexToBigInt(l2ToL1Log.blockHash),
|
@@ -98,7 +98,7 @@ export const formattersZkSync = {
|
|
98
98
|
transactionHash: l2ToL1Log.transactionHash,
|
99
99
|
logIndex: hexToBigInt(l2ToL1Log.logIndex),
|
100
100
|
}
|
101
|
-
}) as
|
101
|
+
}) as ZkSyncL2ToL1Log[],
|
102
102
|
} as ZkSyncTransactionReceipt
|
103
103
|
},
|
104
104
|
}),
|
@@ -112,11 +112,10 @@ export const formattersZkSync = {
|
|
112
112
|
],
|
113
113
|
format(args: ZkSyncTransactionRequest): ZkSyncRpcTransactionRequest {
|
114
114
|
if (
|
115
|
-
|
116
|
-
(args.
|
117
|
-
|
118
|
-
|
119
|
-
args.customSignature)
|
115
|
+
args.gasPerPubdata ||
|
116
|
+
(args.paymaster && args.paymasterInput) ||
|
117
|
+
args.factoryDeps ||
|
118
|
+
args.customSignature
|
120
119
|
)
|
121
120
|
return {
|
122
121
|
eip712Meta: {
|
@@ -0,0 +1,124 @@
|
|
1
|
+
import { InvalidAddressError } from '../../errors/address.js'
|
2
|
+
import { BaseError } from '../../errors/base.js'
|
3
|
+
import { InvalidChainIdError } from '../../errors/chain.js'
|
4
|
+
import type { ChainSerializers } from '../../types/chain.js'
|
5
|
+
import type { TransactionSerializable } from '../../types/transaction.js'
|
6
|
+
import { isAddress } from '../../utils/address/isAddress.js'
|
7
|
+
import { concatHex } from '../../utils/data/concat.js'
|
8
|
+
import { toHex } from '../../utils/encoding/toHex.js'
|
9
|
+
import { toRlp } from '../../utils/encoding/toRlp.js'
|
10
|
+
import {
|
11
|
+
type SerializeTransactionFn,
|
12
|
+
serializeTransaction,
|
13
|
+
} from '../../utils/transaction/serializeTransaction.js'
|
14
|
+
import type {
|
15
|
+
ZkSyncTransactionSerializable,
|
16
|
+
ZkSyncTransactionSerializableEIP712,
|
17
|
+
ZkSyncTransactionSerializedEIP712,
|
18
|
+
} from './types.js'
|
19
|
+
|
20
|
+
export const serializeTransactionZkSync: SerializeTransactionFn<
|
21
|
+
ZkSyncTransactionSerializable
|
22
|
+
> = (tx, signature) => {
|
23
|
+
if (isEIP712(tx))
|
24
|
+
return serializeTransactionZkSyncEIP712(
|
25
|
+
tx as ZkSyncTransactionSerializableEIP712,
|
26
|
+
)
|
27
|
+
return serializeTransaction(tx as TransactionSerializable, signature)
|
28
|
+
}
|
29
|
+
|
30
|
+
export const serializersZkSync = {
|
31
|
+
transaction: serializeTransactionZkSync,
|
32
|
+
} as const satisfies ChainSerializers
|
33
|
+
|
34
|
+
//////////////////////////////////////////////////////////////////////////////
|
35
|
+
// Serializers
|
36
|
+
|
37
|
+
export type SerializeTransactionEIP712ReturnType =
|
38
|
+
ZkSyncTransactionSerializedEIP712
|
39
|
+
|
40
|
+
function serializeTransactionZkSyncEIP712(
|
41
|
+
transaction: ZkSyncTransactionSerializableEIP712,
|
42
|
+
): SerializeTransactionEIP712ReturnType {
|
43
|
+
const {
|
44
|
+
chainId,
|
45
|
+
gas,
|
46
|
+
nonce,
|
47
|
+
to,
|
48
|
+
from,
|
49
|
+
value,
|
50
|
+
maxFeePerGas,
|
51
|
+
maxPriorityFeePerGas,
|
52
|
+
customSignature,
|
53
|
+
factoryDeps,
|
54
|
+
paymaster,
|
55
|
+
paymasterInput,
|
56
|
+
gasPerPubdata,
|
57
|
+
data,
|
58
|
+
} = transaction
|
59
|
+
|
60
|
+
assertTransactionEIP712(transaction)
|
61
|
+
|
62
|
+
const serializedTransaction = [
|
63
|
+
nonce ? toHex(nonce) : '0x',
|
64
|
+
maxPriorityFeePerGas ? toHex(maxPriorityFeePerGas) : '0x',
|
65
|
+
maxFeePerGas ? toHex(maxFeePerGas) : '0x',
|
66
|
+
gas ? toHex(gas) : '0x',
|
67
|
+
to ?? '0x',
|
68
|
+
value ? toHex(value) : '0x',
|
69
|
+
data ?? '0x',
|
70
|
+
toHex(chainId),
|
71
|
+
toHex(''),
|
72
|
+
toHex(''),
|
73
|
+
toHex(chainId),
|
74
|
+
from ?? '0x',
|
75
|
+
gasPerPubdata ? toHex(gasPerPubdata) : '0x',
|
76
|
+
factoryDeps ?? [],
|
77
|
+
customSignature ?? '0x', // EIP712 signature
|
78
|
+
paymaster && paymasterInput ? [paymaster, paymasterInput] : [],
|
79
|
+
]
|
80
|
+
|
81
|
+
return concatHex([
|
82
|
+
'0x71',
|
83
|
+
toRlp(serializedTransaction),
|
84
|
+
]) as SerializeTransactionEIP712ReturnType
|
85
|
+
}
|
86
|
+
|
87
|
+
//////////////////////////////////////////////////////////////////////////////
|
88
|
+
// Utilities
|
89
|
+
|
90
|
+
function isEIP712(transaction: ZkSyncTransactionSerializable) {
|
91
|
+
if (
|
92
|
+
'customSignature' in transaction ||
|
93
|
+
'paymaster' in transaction ||
|
94
|
+
'paymasterInput' in transaction ||
|
95
|
+
'gasPerPubdata' in transaction ||
|
96
|
+
'factoryDeps' in transaction
|
97
|
+
)
|
98
|
+
return true
|
99
|
+
return false
|
100
|
+
}
|
101
|
+
|
102
|
+
export function assertTransactionEIP712(
|
103
|
+
transaction: ZkSyncTransactionSerializableEIP712,
|
104
|
+
) {
|
105
|
+
const { chainId, to, from, paymaster, paymasterInput } = transaction
|
106
|
+
if (chainId <= 0) throw new InvalidChainIdError({ chainId })
|
107
|
+
|
108
|
+
if (to && !isAddress(to)) throw new InvalidAddressError({ address: to })
|
109
|
+
if (from && !isAddress(from)) throw new InvalidAddressError({ address: from })
|
110
|
+
if (paymaster && !isAddress(paymaster))
|
111
|
+
throw new InvalidAddressError({ address: paymaster })
|
112
|
+
|
113
|
+
if (paymaster && !paymasterInput) {
|
114
|
+
throw new BaseError(
|
115
|
+
'`paymasterInput` must be provided when `paymaster` is defined',
|
116
|
+
)
|
117
|
+
}
|
118
|
+
|
119
|
+
if (!paymaster && paymasterInput) {
|
120
|
+
throw new BaseError(
|
121
|
+
'`paymaster` must be provided when `paymasterInput` is defined',
|
122
|
+
)
|
123
|
+
}
|
124
|
+
}
|