viem 2.16.5 → 2.17.1
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +24 -0
- package/_cjs/actions/public/watchContractEvent.js +1 -1
- package/_cjs/actions/public/watchContractEvent.js.map +1 -1
- package/_cjs/celo/formatters.js +17 -12
- package/_cjs/celo/formatters.js.map +1 -1
- package/_cjs/celo/parsers.js +2 -1
- package/_cjs/celo/parsers.js.map +1 -1
- package/_cjs/celo/serializers.js +2 -1
- package/_cjs/celo/serializers.js.map +1 -1
- package/_cjs/chains/definitions/berachainTestnetbArtio.js +6 -0
- package/_cjs/chains/definitions/berachainTestnetbArtio.js.map +1 -1
- package/_cjs/chains/definitions/btr.js +3 -4
- package/_cjs/chains/definitions/btr.js.map +1 -1
- package/_cjs/chains/definitions/btrTestnet.js +4 -5
- package/_cjs/chains/definitions/btrTestnet.js.map +1 -1
- package/_cjs/chains/definitions/crab.js +29 -0
- package/_cjs/chains/definitions/crab.js.map +1 -0
- package/_cjs/chains/definitions/koi.js +30 -0
- package/_cjs/chains/definitions/koi.js.map +1 -0
- package/_cjs/chains/definitions/seiTestnet.js +23 -0
- package/_cjs/chains/definitions/seiTestnet.js.map +1 -0
- package/_cjs/chains/definitions/taikoHekla.js +1 -0
- package/_cjs/chains/definitions/taikoHekla.js.map +1 -1
- package/_cjs/chains/definitions/xLayerTestnet.js +2 -2
- package/_cjs/chains/definitions/xLayerTestnet.js.map +1 -1
- package/_cjs/chains/definitions/zkLinkNova.js +23 -0
- package/_cjs/chains/definitions/zkLinkNova.js.map +1 -0
- package/_cjs/chains/index.js +13 -5
- package/_cjs/chains/index.js.map +1 -1
- package/_cjs/errors/version.js +1 -1
- package/_cjs/op-stack/formatters.js.map +1 -1
- package/_cjs/utils/formatters/formatter.js.map +1 -1
- package/_cjs/zksync/formatters.js.map +1 -1
- package/_cjs/zksync/index.js.map +1 -1
- package/_esm/actions/public/watchContractEvent.js +1 -1
- package/_esm/actions/public/watchContractEvent.js.map +1 -1
- package/_esm/celo/formatters.js +17 -12
- package/_esm/celo/formatters.js.map +1 -1
- package/_esm/celo/parsers.js +3 -2
- package/_esm/celo/parsers.js.map +1 -1
- package/_esm/celo/serializers.js +3 -2
- package/_esm/celo/serializers.js.map +1 -1
- package/_esm/chains/definitions/berachainTestnetbArtio.js +6 -0
- package/_esm/chains/definitions/berachainTestnetbArtio.js.map +1 -1
- package/_esm/chains/definitions/btr.js +3 -4
- package/_esm/chains/definitions/btr.js.map +1 -1
- package/_esm/chains/definitions/btrTestnet.js +4 -5
- package/_esm/chains/definitions/btrTestnet.js.map +1 -1
- package/_esm/chains/definitions/crab.js +26 -0
- package/_esm/chains/definitions/crab.js.map +1 -0
- package/_esm/chains/definitions/koi.js +27 -0
- package/_esm/chains/definitions/koi.js.map +1 -0
- package/_esm/chains/definitions/seiTestnet.js +20 -0
- package/_esm/chains/definitions/seiTestnet.js.map +1 -0
- package/_esm/chains/definitions/taikoHekla.js +1 -0
- package/_esm/chains/definitions/taikoHekla.js.map +1 -1
- package/_esm/chains/definitions/xLayerTestnet.js +2 -2
- package/_esm/chains/definitions/xLayerTestnet.js.map +1 -1
- package/_esm/chains/definitions/zkLinkNova.js +20 -0
- package/_esm/chains/definitions/zkLinkNova.js.map +1 -0
- package/_esm/chains/index.js +4 -0
- package/_esm/chains/index.js.map +1 -1
- package/_esm/errors/version.js +1 -1
- package/_esm/op-stack/formatters.js.map +1 -1
- package/_esm/utils/formatters/formatter.js.map +1 -1
- package/_esm/zksync/formatters.js.map +1 -1
- package/_esm/zksync/index.js.map +1 -1
- package/_types/celo/chainConfig.d.ts +445 -3773
- package/_types/celo/chainConfig.d.ts.map +1 -1
- package/_types/celo/formatters.d.ts +222 -1887
- package/_types/celo/formatters.d.ts.map +1 -1
- package/_types/celo/index.d.ts +1 -1
- package/_types/celo/index.d.ts.map +1 -1
- package/_types/celo/parsers.d.ts.map +1 -1
- package/_types/celo/serializers.d.ts +1 -1
- package/_types/celo/serializers.d.ts.map +1 -1
- package/_types/celo/types.d.ts +38 -28
- package/_types/celo/types.d.ts.map +1 -1
- package/_types/chains/definitions/ancient8.d.ts +18 -820
- package/_types/chains/definitions/ancient8.d.ts.map +1 -1
- package/_types/chains/definitions/ancient8Sepolia.d.ts +18 -820
- package/_types/chains/definitions/ancient8Sepolia.d.ts.map +1 -1
- package/_types/chains/definitions/base.d.ts +18 -820
- package/_types/chains/definitions/base.d.ts.map +1 -1
- package/_types/chains/definitions/baseGoerli.d.ts +18 -820
- package/_types/chains/definitions/baseGoerli.d.ts.map +1 -1
- package/_types/chains/definitions/baseSepolia.d.ts +18 -820
- package/_types/chains/definitions/baseSepolia.d.ts.map +1 -1
- package/_types/chains/definitions/berachainTestnetbArtio.d.ts +6 -8
- package/_types/chains/definitions/berachainTestnetbArtio.d.ts.map +1 -1
- package/_types/chains/definitions/btr.d.ts +3 -4
- package/_types/chains/definitions/btr.d.ts.map +1 -1
- package/_types/chains/definitions/btrTestnet.d.ts +4 -5
- package/_types/chains/definitions/btrTestnet.d.ts.map +1 -1
- package/_types/chains/definitions/celo.d.ts +442 -3770
- package/_types/chains/definitions/celo.d.ts.map +1 -1
- package/_types/chains/definitions/celoAlfajores.d.ts +442 -3770
- package/_types/chains/definitions/celoAlfajores.d.ts.map +1 -1
- package/_types/chains/definitions/crab.d.ts +34 -0
- package/_types/chains/definitions/crab.d.ts.map +1 -0
- package/_types/chains/definitions/dchain.d.ts +18 -820
- package/_types/chains/definitions/dchain.d.ts.map +1 -1
- package/_types/chains/definitions/dchainTestnet.d.ts +18 -820
- package/_types/chains/definitions/dchainTestnet.d.ts.map +1 -1
- package/_types/chains/definitions/fraxtal.d.ts +18 -820
- package/_types/chains/definitions/fraxtal.d.ts.map +1 -1
- package/_types/chains/definitions/fraxtalTestnet.d.ts +18 -820
- package/_types/chains/definitions/fraxtalTestnet.d.ts.map +1 -1
- package/_types/chains/definitions/funkiSepolia.d.ts +18 -820
- package/_types/chains/definitions/funkiSepolia.d.ts.map +1 -1
- package/_types/chains/definitions/koi.d.ts +34 -0
- package/_types/chains/definitions/koi.d.ts.map +1 -0
- package/_types/chains/definitions/lisk.d.ts +45 -1148
- package/_types/chains/definitions/lisk.d.ts.map +1 -1
- package/_types/chains/definitions/liskSepolia.d.ts +18 -820
- package/_types/chains/definitions/liskSepolia.d.ts.map +1 -1
- package/_types/chains/definitions/metalL2.d.ts +18 -820
- package/_types/chains/definitions/metalL2.d.ts.map +1 -1
- package/_types/chains/definitions/optimism.d.ts +18 -820
- package/_types/chains/definitions/optimism.d.ts.map +1 -1
- package/_types/chains/definitions/optimismGoerli.d.ts +18 -820
- package/_types/chains/definitions/optimismGoerli.d.ts.map +1 -1
- package/_types/chains/definitions/optimismSepolia.d.ts +18 -820
- package/_types/chains/definitions/optimismSepolia.d.ts.map +1 -1
- package/_types/chains/definitions/pgn.d.ts +18 -820
- package/_types/chains/definitions/pgn.d.ts.map +1 -1
- package/_types/chains/definitions/pgnTestnet.d.ts +18 -820
- package/_types/chains/definitions/pgnTestnet.d.ts.map +1 -1
- package/_types/chains/definitions/playfiAlbireo.d.ts +45 -1148
- package/_types/chains/definitions/playfiAlbireo.d.ts.map +1 -1
- package/_types/chains/definitions/rss3.d.ts +18 -820
- package/_types/chains/definitions/rss3.d.ts.map +1 -1
- package/_types/chains/definitions/rss3Sepolia.d.ts +18 -820
- package/_types/chains/definitions/rss3Sepolia.d.ts.map +1 -1
- package/_types/chains/definitions/seiTestnet.d.ts +36 -0
- package/_types/chains/definitions/seiTestnet.d.ts.map +1 -0
- package/_types/chains/definitions/taikoHekla.d.ts +1 -1
- package/_types/chains/definitions/taikoHekla.d.ts.map +1 -1
- package/_types/chains/definitions/xLayerTestnet.d.ts +2 -2
- package/_types/chains/definitions/zkLinkNova.d.ts +35 -0
- package/_types/chains/definitions/zkLinkNova.d.ts.map +1 -0
- package/_types/chains/definitions/zkSync.d.ts +45 -1148
- package/_types/chains/definitions/zkSync.d.ts.map +1 -1
- package/_types/chains/definitions/zkSyncInMemoryNode.d.ts +45 -1148
- package/_types/chains/definitions/zkSyncInMemoryNode.d.ts.map +1 -1
- package/_types/chains/definitions/zkSyncLocalNode.d.ts +45 -1148
- package/_types/chains/definitions/zkSyncLocalNode.d.ts.map +1 -1
- package/_types/chains/definitions/zkSyncSepoliaTestnet.d.ts +45 -1148
- package/_types/chains/definitions/zkSyncSepoliaTestnet.d.ts.map +1 -1
- package/_types/chains/definitions/zkSyncTestnet.d.ts +45 -1148
- package/_types/chains/definitions/zkSyncTestnet.d.ts.map +1 -1
- package/_types/chains/definitions/zora.d.ts +18 -820
- package/_types/chains/definitions/zora.d.ts.map +1 -1
- package/_types/chains/definitions/zoraSepolia.d.ts +18 -820
- package/_types/chains/definitions/zoraSepolia.d.ts.map +1 -1
- package/_types/chains/definitions/zoraTestnet.d.ts +18 -820
- package/_types/chains/definitions/zoraTestnet.d.ts.map +1 -1
- package/_types/chains/index.d.ts +6 -2
- package/_types/chains/index.d.ts.map +1 -1
- package/_types/errors/version.d.ts +1 -1
- package/_types/op-stack/chainConfig.d.ts +18 -820
- package/_types/op-stack/chainConfig.d.ts.map +1 -1
- package/_types/op-stack/formatters.d.ts +60 -863
- package/_types/op-stack/formatters.d.ts.map +1 -1
- package/_types/op-stack/types/transaction.d.ts +1 -1
- package/_types/op-stack/types/transaction.d.ts.map +1 -1
- package/_types/types/utils.d.ts +0 -10
- package/_types/types/utils.d.ts.map +1 -1
- package/_types/utils/formatters/block.d.ts +1 -1
- package/_types/utils/formatters/formatter.d.ts +2 -2
- package/_types/utils/formatters/formatter.d.ts.map +1 -1
- package/_types/utils/formatters/transaction.d.ts +1 -386
- package/_types/utils/formatters/transaction.d.ts.map +1 -1
- package/_types/utils/formatters/transactionReceipt.d.ts +1 -1
- package/_types/utils/formatters/transactionRequest.d.ts +1 -274
- package/_types/utils/formatters/transactionRequest.d.ts.map +1 -1
- package/_types/zksync/chainConfig.d.ts +45 -1148
- package/_types/zksync/chainConfig.d.ts.map +1 -1
- package/_types/zksync/formatters.d.ts +100 -1204
- package/_types/zksync/formatters.d.ts.map +1 -1
- package/_types/zksync/index.d.ts +1 -1
- package/_types/zksync/index.d.ts.map +1 -1
- package/_types/zksync/types/block.d.ts +5 -6
- package/_types/zksync/types/block.d.ts.map +1 -1
- package/_types/zksync/types/transaction.d.ts +2 -1
- package/_types/zksync/types/transaction.d.ts.map +1 -1
- package/actions/public/watchContractEvent.ts +1 -1
- package/celo/formatters.ts +22 -24
- package/celo/index.ts +0 -2
- package/celo/parsers.ts +5 -3
- package/celo/serializers.ts +3 -5
- package/celo/types.ts +74 -54
- package/chains/definitions/berachainTestnetbArtio.ts +6 -0
- package/chains/definitions/btr.ts +3 -4
- package/chains/definitions/btrTestnet.ts +4 -5
- package/chains/definitions/crab.ts +26 -0
- package/chains/definitions/koi.ts +27 -0
- package/chains/definitions/seiTestnet.ts +20 -0
- package/chains/definitions/taikoHekla.ts +1 -0
- package/chains/definitions/xLayerTestnet.ts +2 -2
- package/chains/definitions/zkLinkNova.ts +20 -0
- package/chains/index.ts +4 -4
- package/errors/version.ts +1 -1
- package/op-stack/formatters.ts +8 -20
- package/op-stack/types/transaction.ts +3 -3
- package/package.json +1 -1
- package/types/utils.ts +0 -11
- package/utils/formatters/formatter.ts +3 -3
- package/zksync/formatters.ts +6 -18
- package/zksync/index.ts +0 -2
- package/zksync/types/block.ts +24 -23
- package/zksync/types/transaction.ts +4 -0
@@ -9,12 +9,12 @@ export const xLayerTestnet = /*#__PURE__*/ defineChain({
|
|
9
9
|
symbol: 'OKB',
|
10
10
|
},
|
11
11
|
rpcUrls: {
|
12
|
-
default: { http: ['https://
|
12
|
+
default: { http: ['https://xlayertestrpc.okx.com'] },
|
13
13
|
},
|
14
14
|
blockExplorers: {
|
15
15
|
default: {
|
16
16
|
name: 'OKLink',
|
17
|
-
url: 'https://www.oklink.com/
|
17
|
+
url: 'https://www.oklink.com/xlayer-test',
|
18
18
|
},
|
19
19
|
},
|
20
20
|
contracts: {
|
@@ -0,0 +1,20 @@
|
|
1
|
+
import { defineChain } from '../../utils/chain/defineChain.js'
|
2
|
+
|
3
|
+
export const zkLinkNova = /*#__PURE__*/ defineChain({
|
4
|
+
id: 810180,
|
5
|
+
name: 'zkLink Nova',
|
6
|
+
nativeCurrency: {
|
7
|
+
decimals: 18,
|
8
|
+
name: 'ETH',
|
9
|
+
symbol: 'ETH',
|
10
|
+
},
|
11
|
+
rpcUrls: {
|
12
|
+
default: { http: ['https://rpc.zklink.io'] },
|
13
|
+
},
|
14
|
+
blockExplorers: {
|
15
|
+
default: {
|
16
|
+
name: 'zkLink Nova Block Explorer',
|
17
|
+
url: 'https://explorer.zklink.io',
|
18
|
+
},
|
19
|
+
},
|
20
|
+
})
|
package/chains/index.ts
CHANGED
@@ -56,6 +56,7 @@ export { classic } from './definitions/classic.js'
|
|
56
56
|
export { confluxESpace } from './definitions/confluxESpace.js'
|
57
57
|
export { confluxESpaceTestnet } from './definitions/confluxESpaceTestnet.js'
|
58
58
|
export { coreDao } from './definitions/coreDao.js'
|
59
|
+
export { crab } from './definitions/crab.js'
|
59
60
|
export { cronos } from './definitions/cronos.js'
|
60
61
|
export { cronosTestnet } from './definitions/cronosTestnet.js'
|
61
62
|
export { crossbell } from './definitions/crossbell.js'
|
@@ -130,6 +131,7 @@ export { kavaTestnet } from './definitions/kavaTestnet.js'
|
|
130
131
|
export { kcc } from './definitions/kcc.js'
|
131
132
|
export { klaytn } from './definitions/klaytn.js'
|
132
133
|
export { klaytnBaobab } from './definitions/klaytnBaobab.js'
|
134
|
+
export { koi } from './definitions/koi.js'
|
133
135
|
export { kroma } from './definitions/kroma.js'
|
134
136
|
export { kromaSepolia } from './definitions/kromaSepolia.js'
|
135
137
|
export { l3x } from './definitions/l3x.js'
|
@@ -229,6 +231,7 @@ export { scroll } from './definitions/scroll.js'
|
|
229
231
|
export { scrollSepolia } from './definitions/scrollSepolia.js'
|
230
232
|
export { sei } from './definitions/sei.js'
|
231
233
|
export { seiDevnet } from './definitions/seiDevnet.js'
|
234
|
+
export { seiTestnet } from './definitions/seiTestnet.js'
|
232
235
|
export { sepolia } from './definitions/sepolia.js'
|
233
236
|
export { shimmer } from './definitions/shimmer.js'
|
234
237
|
export { shimmerTestnet } from './definitions/shimmerTestnet.js'
|
@@ -294,6 +297,7 @@ export { zilliqa } from './definitions/zilliqa.js'
|
|
294
297
|
export { zilliqaTestnet } from './definitions/zilliqaTestnet.js'
|
295
298
|
export { zkFair } from './definitions/zkFair.js'
|
296
299
|
export { zkFairTestnet } from './definitions/zkFairTestnet.js'
|
300
|
+
export { zkLinkNova } from './definitions/zkLinkNova.js'
|
297
301
|
export { zkSync } from './definitions/zkSync.js'
|
298
302
|
export { zkSyncInMemoryNode } from './definitions/zkSyncInMemoryNode.js'
|
299
303
|
export { zkSyncLocalNode } from './definitions/zkSyncLocalNode.js'
|
@@ -316,9 +320,7 @@ export type {
|
|
316
320
|
} from '../types/utils.js'
|
317
321
|
export type {
|
318
322
|
CeloBlock,
|
319
|
-
CeloBlockOverrides,
|
320
323
|
CeloRpcBlock,
|
321
|
-
CeloRpcBlockOverrides,
|
322
324
|
CeloRpcTransaction,
|
323
325
|
CeloRpcTransactionRequest,
|
324
326
|
CeloTransaction,
|
@@ -368,9 +370,7 @@ export type {
|
|
368
370
|
} from '../op-stack/types/transaction.js'
|
369
371
|
export type {
|
370
372
|
ZkSyncBlock,
|
371
|
-
ZkSyncBlockOverrides,
|
372
373
|
ZkSyncRpcBlock,
|
373
|
-
ZkSyncRpcBlockOverrides,
|
374
374
|
} from '../zksync/types/block.js'
|
375
375
|
export type { ChainEIP712 } from '../zksync/types/chain.js'
|
376
376
|
export type { ZkSyncEip712Meta } from '../zksync/types/eip712.js'
|
package/errors/version.ts
CHANGED
@@ -1 +1 @@
|
|
1
|
-
export const version = '2.
|
1
|
+
export const version = '2.17.1'
|
package/op-stack/formatters.ts
CHANGED
@@ -1,5 +1,4 @@
|
|
1
1
|
import type { ChainFormatters } from '../types/chain.js'
|
2
|
-
import type { Hash } from '../types/misc.js'
|
3
2
|
import type { RpcTransaction } from '../types/rpc.js'
|
4
3
|
import { hexToBigInt } from '../utils/encoding/fromHex.js'
|
5
4
|
import { defineBlock } from '../utils/formatters/block.js'
|
@@ -8,26 +7,17 @@ import {
|
|
8
7
|
formatTransaction,
|
9
8
|
} from '../utils/formatters/transaction.js'
|
10
9
|
import { defineTransactionReceipt } from '../utils/formatters/transactionReceipt.js'
|
11
|
-
import type {
|
12
|
-
OpStackBlockOverrides,
|
13
|
-
OpStackRpcBlockOverrides,
|
14
|
-
} from './types/block.js'
|
10
|
+
import type { OpStackBlock, OpStackRpcBlock } from './types/block.js'
|
15
11
|
import type {
|
16
12
|
OpStackRpcTransaction,
|
17
|
-
|
13
|
+
OpStackRpcTransactionReceipt,
|
18
14
|
OpStackTransaction,
|
19
|
-
|
15
|
+
OpStackTransactionReceipt,
|
20
16
|
} from './types/transaction.js'
|
21
17
|
|
22
18
|
export const formatters = {
|
23
19
|
block: /*#__PURE__*/ defineBlock({
|
24
|
-
format(
|
25
|
-
args: OpStackRpcBlockOverrides & {
|
26
|
-
transactions: Hash[] | OpStackRpcTransaction[]
|
27
|
-
},
|
28
|
-
): OpStackBlockOverrides & {
|
29
|
-
transactions: Hash[] | OpStackTransaction[]
|
30
|
-
} {
|
20
|
+
format(args: OpStackRpcBlock): OpStackBlock {
|
31
21
|
const transactions = args.transactions?.map((transaction) => {
|
32
22
|
if (typeof transaction === 'string') return transaction
|
33
23
|
const formatted = formatTransaction(
|
@@ -42,11 +32,11 @@ export const formatters = {
|
|
42
32
|
formatted.type = 'deposit'
|
43
33
|
}
|
44
34
|
return formatted
|
45
|
-
})
|
35
|
+
})
|
46
36
|
return {
|
47
37
|
transactions,
|
48
38
|
stateRoot: args.stateRoot,
|
49
|
-
}
|
39
|
+
} as OpStackBlock
|
50
40
|
},
|
51
41
|
}),
|
52
42
|
transaction: /*#__PURE__*/ defineTransaction({
|
@@ -62,15 +52,13 @@ export const formatters = {
|
|
62
52
|
},
|
63
53
|
}),
|
64
54
|
transactionReceipt: /*#__PURE__*/ defineTransactionReceipt({
|
65
|
-
format(
|
66
|
-
args: OpStackRpcTransactionReceiptOverrides,
|
67
|
-
): OpStackTransactionReceiptOverrides {
|
55
|
+
format(args: OpStackRpcTransactionReceipt): OpStackTransactionReceipt {
|
68
56
|
return {
|
69
57
|
l1GasPrice: args.l1GasPrice ? hexToBigInt(args.l1GasPrice) : null,
|
70
58
|
l1GasUsed: args.l1GasUsed ? hexToBigInt(args.l1GasUsed) : null,
|
71
59
|
l1Fee: args.l1Fee ? hexToBigInt(args.l1Fee) : null,
|
72
60
|
l1FeeScalar: args.l1FeeScalar ? Number(args.l1FeeScalar) : null,
|
73
|
-
}
|
61
|
+
} as OpStackTransactionReceipt
|
74
62
|
},
|
75
63
|
}),
|
76
64
|
} as const satisfies ChainFormatters
|
@@ -32,9 +32,9 @@ export type OpStackRpcDepositTransaction<TPending extends boolean = boolean> =
|
|
32
32
|
sourceHash: Hex
|
33
33
|
type: '0x7e'
|
34
34
|
}
|
35
|
-
export type OpStackRpcTransaction<TPending extends boolean = boolean> =
|
36
|
-
|
|
37
|
-
|
35
|
+
export type OpStackRpcTransaction<TPending extends boolean = boolean> = OneOf<
|
36
|
+
RpcTransaction<TPending> | OpStackRpcDepositTransaction<TPending>
|
37
|
+
>
|
38
38
|
|
39
39
|
export type OpStackRpcTransactionReceiptOverrides = {
|
40
40
|
l1GasPrice: Hex | null
|
package/package.json
CHANGED
package/types/utils.ts
CHANGED
@@ -139,17 +139,6 @@ type Assign_<T, U> = {
|
|
139
139
|
: K]: K extends keyof U ? U[K] : T[K]
|
140
140
|
}
|
141
141
|
|
142
|
-
/**
|
143
|
-
* @description Make properties K of type T never.
|
144
|
-
*
|
145
|
-
* @example
|
146
|
-
* NeverBy<{ a: string, b: boolean, c: number }, 'a' | 'c'>
|
147
|
-
* => { a: never, b: boolean, c: never }
|
148
|
-
*/
|
149
|
-
export type NeverBy<T, K extends keyof T> = {
|
150
|
-
[U in keyof T]: U extends K ? never : T[U]
|
151
|
-
}
|
152
|
-
|
153
142
|
// TODO: Remove when peer dep `typescript@>=4.5` (NoInfer is native)
|
154
143
|
export type NoInfer<type> = [type][type extends any ? 0 : never]
|
155
144
|
|
@@ -1,5 +1,5 @@
|
|
1
1
|
import type { ErrorType } from '../../errors/utils.js'
|
2
|
-
import type {
|
2
|
+
import type { Prettify } from '../../types/utils.js'
|
3
3
|
|
4
4
|
export type DefineFormatterErrorType = ErrorType
|
5
5
|
|
@@ -20,7 +20,7 @@ export function defineFormatter<TType extends string, TParameters, TReturnType>(
|
|
20
20
|
}) => {
|
21
21
|
return {
|
22
22
|
exclude,
|
23
|
-
format: (args:
|
23
|
+
format: (args: TOverrideParameters) => {
|
24
24
|
const formatted = format(args as any)
|
25
25
|
if (exclude) {
|
26
26
|
for (const key of exclude) {
|
@@ -30,7 +30,7 @@ export function defineFormatter<TType extends string, TParameters, TReturnType>(
|
|
30
30
|
return {
|
31
31
|
...formatted,
|
32
32
|
...overrides(args),
|
33
|
-
} as Prettify<
|
33
|
+
} as Prettify<TOverrideReturnType> & {
|
34
34
|
[_key in TExclude[number]]: never
|
35
35
|
}
|
36
36
|
},
|
package/zksync/formatters.ts
CHANGED
@@ -1,5 +1,4 @@
|
|
1
1
|
import type { ChainFormatters } from '../types/chain.js'
|
2
|
-
import type { Hash } from '../types/misc.js'
|
3
2
|
import { hexToBigInt, hexToNumber } from '../utils/encoding/fromHex.js'
|
4
3
|
import { hexToBytes } from '../utils/encoding/toBytes.js'
|
5
4
|
import { toHex } from '../utils/encoding/toHex.js'
|
@@ -9,14 +8,11 @@ import { defineTransaction } from '../utils/formatters/transaction.js'
|
|
9
8
|
import { defineTransactionReceipt } from '../utils/formatters/transactionReceipt.js'
|
10
9
|
import { defineTransactionRequest } from '../utils/formatters/transactionRequest.js'
|
11
10
|
import { gasPerPubdataDefault } from './constants/number.js'
|
12
|
-
import type {
|
13
|
-
ZkSyncBlockOverrides,
|
14
|
-
ZkSyncRpcBlockOverrides,
|
15
|
-
} from './types/block.js'
|
11
|
+
import type { ZkSyncBlock, ZkSyncRpcBlock } from './types/block.js'
|
16
12
|
import type { ZkSyncL2ToL1Log, ZkSyncLog } from './types/log.js'
|
17
13
|
import type {
|
18
14
|
ZkSyncRpcTransaction,
|
19
|
-
|
15
|
+
ZkSyncRpcTransactionReceipt,
|
20
16
|
ZkSyncRpcTransactionRequest,
|
21
17
|
ZkSyncTransaction,
|
22
18
|
ZkSyncTransactionReceipt,
|
@@ -25,13 +21,7 @@ import type {
|
|
25
21
|
|
26
22
|
export const formatters = {
|
27
23
|
block: /*#__PURE__*/ defineBlock({
|
28
|
-
format(
|
29
|
-
args: ZkSyncRpcBlockOverrides & {
|
30
|
-
transactions: Hash[] | ZkSyncRpcTransaction[]
|
31
|
-
},
|
32
|
-
): ZkSyncBlockOverrides & {
|
33
|
-
transactions: Hash[] | ZkSyncTransaction[]
|
34
|
-
} {
|
24
|
+
format(args: ZkSyncRpcBlock): ZkSyncBlock {
|
35
25
|
const transactions = args.transactions?.map((transaction) => {
|
36
26
|
if (typeof transaction === 'string') return transaction
|
37
27
|
const formatted = formatters.transaction?.format(
|
@@ -40,7 +30,7 @@ export const formatters = {
|
|
40
30
|
if (formatted.typeHex === '0x71') formatted.type = 'eip712'
|
41
31
|
else if (formatted.typeHex === '0xff') formatted.type = 'priority'
|
42
32
|
return formatted
|
43
|
-
})
|
33
|
+
})
|
44
34
|
return {
|
45
35
|
l1BatchNumber: args.l1BatchNumber
|
46
36
|
? hexToBigInt(args.l1BatchNumber)
|
@@ -49,7 +39,7 @@ export const formatters = {
|
|
49
39
|
? hexToBigInt(args.l1BatchTimestamp)
|
50
40
|
: null,
|
51
41
|
transactions,
|
52
|
-
}
|
42
|
+
} as ZkSyncBlock
|
53
43
|
},
|
54
44
|
}),
|
55
45
|
transaction: /*#__PURE__*/ defineTransaction({
|
@@ -69,9 +59,7 @@ export const formatters = {
|
|
69
59
|
},
|
70
60
|
}),
|
71
61
|
transactionReceipt: /*#__PURE__*/ defineTransactionReceipt({
|
72
|
-
format(
|
73
|
-
args: ZkSyncRpcTransactionReceiptOverrides,
|
74
|
-
): ZkSyncTransactionReceipt {
|
62
|
+
format(args: ZkSyncRpcTransactionReceipt): ZkSyncTransactionReceipt {
|
75
63
|
return {
|
76
64
|
l1BatchNumber: args.l1BatchNumber
|
77
65
|
? hexToBigInt(args.l1BatchNumber)
|
package/zksync/index.ts
CHANGED
@@ -124,9 +124,7 @@ export { serializeTransaction } from './serializers.js'
|
|
124
124
|
|
125
125
|
export type {
|
126
126
|
ZkSyncBlock,
|
127
|
-
ZkSyncBlockOverrides,
|
128
127
|
ZkSyncRpcBlock,
|
129
|
-
ZkSyncRpcBlockOverrides,
|
130
128
|
} from './types/block.js'
|
131
129
|
export type { ChainEIP712 } from './types/chain.js'
|
132
130
|
export type {
|
package/zksync/types/block.ts
CHANGED
@@ -2,6 +2,7 @@ import type { Address } from 'abitype'
|
|
2
2
|
import type { Block, BlockTag } from '../../types/block.js'
|
3
3
|
import type { Hash, Hex } from '../../types/misc.js'
|
4
4
|
import type { RpcBlock } from '../../types/rpc.js'
|
5
|
+
import type { Assign } from '../../types/utils.js'
|
5
6
|
import type { ZkSyncRpcTransaction, ZkSyncTransaction } from './transaction.js'
|
6
7
|
|
7
8
|
export type ZkSyncBatchDetails = Omit<
|
@@ -12,21 +13,21 @@ export type ZkSyncBatchDetails = Omit<
|
|
12
13
|
l2FairGasPrice: number
|
13
14
|
}
|
14
15
|
|
15
|
-
export type ZkSyncBlockOverrides = {
|
16
|
-
l1BatchNumber: bigint | null
|
17
|
-
l1BatchTimestamp: bigint | null
|
18
|
-
}
|
19
|
-
|
20
16
|
export type ZkSyncBlock<
|
21
17
|
TIncludeTransactions extends boolean = boolean,
|
22
18
|
TBlockTag extends BlockTag = BlockTag,
|
23
|
-
> =
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
>
|
29
|
-
|
19
|
+
> = Assign<
|
20
|
+
Block<
|
21
|
+
bigint,
|
22
|
+
TIncludeTransactions,
|
23
|
+
TBlockTag,
|
24
|
+
ZkSyncTransaction<TBlockTag extends 'pending' ? true : false>
|
25
|
+
>,
|
26
|
+
{
|
27
|
+
l1BatchNumber: bigint | null
|
28
|
+
l1BatchTimestamp: bigint | null
|
29
|
+
}
|
30
|
+
>
|
30
31
|
|
31
32
|
export type ZkSyncBlockDetails = {
|
32
33
|
number: number
|
@@ -50,20 +51,20 @@ export type ZkSyncBlockDetails = {
|
|
50
51
|
protocolVersion?: string
|
51
52
|
}
|
52
53
|
|
53
|
-
export type ZkSyncRpcBlockOverrides = {
|
54
|
-
l1BatchNumber: Hex | null
|
55
|
-
l1BatchTimestamp: Hex | null
|
56
|
-
}
|
57
|
-
|
58
54
|
export type ZkSyncRpcBlock<
|
59
55
|
TBlockTag extends BlockTag = BlockTag,
|
60
56
|
TIncludeTransactions extends boolean = boolean,
|
61
|
-
> =
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
>
|
66
|
-
|
57
|
+
> = Assign<
|
58
|
+
RpcBlock<
|
59
|
+
TBlockTag,
|
60
|
+
TIncludeTransactions,
|
61
|
+
ZkSyncRpcTransaction<TBlockTag extends 'pending' ? true : false>
|
62
|
+
>,
|
63
|
+
{
|
64
|
+
l1BatchNumber: Hex | null
|
65
|
+
l1BatchTimestamp: Hex | null
|
66
|
+
}
|
67
|
+
>
|
67
68
|
|
68
69
|
export type ZkSyncNumberParameter = {
|
69
70
|
number: number
|
@@ -4,6 +4,7 @@ import type { Hash, Hex } from '../../types/misc.js'
|
|
4
4
|
import type {
|
5
5
|
Index,
|
6
6
|
Quantity,
|
7
|
+
RpcTransactionReceipt,
|
7
8
|
RpcTransactionRequest as RpcTransactionRequest_,
|
8
9
|
} from '../../types/rpc.js'
|
9
10
|
import type {
|
@@ -174,6 +175,9 @@ export type ZkSyncRpcTransactionReceiptOverrides = {
|
|
174
175
|
root: Hex
|
175
176
|
}
|
176
177
|
|
178
|
+
export type ZkSyncRpcTransactionReceipt = Omit<RpcTransactionReceipt, 'logs'> &
|
179
|
+
ZkSyncRpcTransactionReceiptOverrides
|
180
|
+
|
177
181
|
export type ZkSyncTransactionReceiptOverrides = {
|
178
182
|
l1BatchNumber: bigint | null
|
179
183
|
l1BatchTxIndex: bigint | null
|