viem 2.57.13 → 2.57.15

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.
Files changed (304) hide show
  1. package/CHANGELOG.md +60 -0
  2. package/_cjs/account-abstraction/utils/formatters/userOperationReceipt.js +2 -0
  3. package/_cjs/account-abstraction/utils/formatters/userOperationReceipt.js.map +1 -1
  4. package/_cjs/actions/public/estimateGas.js +5 -2
  5. package/_cjs/actions/public/estimateGas.js.map +1 -1
  6. package/_cjs/actions/public/fillTransaction.js +2 -0
  7. package/_cjs/actions/public/fillTransaction.js.map +1 -1
  8. package/_cjs/actions/public/getFilterChanges.js +1 -0
  9. package/_cjs/actions/public/getFilterChanges.js.map +1 -1
  10. package/_cjs/actions/public/getFilterLogs.js +1 -0
  11. package/_cjs/actions/public/getFilterLogs.js.map +1 -1
  12. package/_cjs/actions/public/watchBlockNumber.js +3 -1
  13. package/_cjs/actions/public/watchBlockNumber.js.map +1 -1
  14. package/_cjs/actions/public/watchBlocks.js +20 -8
  15. package/_cjs/actions/public/watchBlocks.js.map +1 -1
  16. package/_cjs/actions/public/watchContractEvent.js +10 -3
  17. package/_cjs/actions/public/watchContractEvent.js.map +1 -1
  18. package/_cjs/actions/public/watchEvent.js +5 -0
  19. package/_cjs/actions/public/watchEvent.js.map +1 -1
  20. package/_cjs/actions/wallet/prepareTransactionRequest.js +3 -2
  21. package/_cjs/actions/wallet/prepareTransactionRequest.js.map +1 -1
  22. package/_cjs/actions/wallet/sendTransaction.js +4 -2
  23. package/_cjs/actions/wallet/sendTransaction.js.map +1 -1
  24. package/_cjs/actions/wallet/sendTransactionSync.js +48 -7
  25. package/_cjs/actions/wallet/sendTransactionSync.js.map +1 -1
  26. package/_cjs/chains/definitions/hashKeyChain.js +4 -4
  27. package/_cjs/chains/definitions/hashKeyChain.js.map +1 -1
  28. package/_cjs/chains/definitions/hashkeyChainTestnet.js +4 -4
  29. package/_cjs/chains/definitions/hashkeyChainTestnet.js.map +1 -1
  30. package/_cjs/chains/definitions/turkchain.js +26 -0
  31. package/_cjs/chains/definitions/turkchain.js.map +1 -0
  32. package/_cjs/chains/definitions/zksync.js +1 -1
  33. package/_cjs/chains/definitions/zksync.js.map +1 -1
  34. package/_cjs/chains/index.js +4 -2
  35. package/_cjs/chains/index.js.map +1 -1
  36. package/_cjs/clients/createClient.js.map +1 -1
  37. package/_cjs/clients/transports/fallback.js +5 -0
  38. package/_cjs/clients/transports/fallback.js.map +1 -1
  39. package/_cjs/errors/node.js +10 -4
  40. package/_cjs/errors/node.js.map +1 -1
  41. package/_cjs/errors/typedData.js +4 -2
  42. package/_cjs/errors/typedData.js.map +1 -1
  43. package/_cjs/errors/version.js +1 -1
  44. package/_cjs/index.js +5 -4
  45. package/_cjs/index.js.map +1 -1
  46. package/_cjs/tempo/Account.js +85 -12
  47. package/_cjs/tempo/Account.js.map +1 -1
  48. package/_cjs/tempo/Formatters.js +4 -1
  49. package/_cjs/tempo/Formatters.js.map +1 -1
  50. package/_cjs/tempo/Relay.js +5 -0
  51. package/_cjs/tempo/Relay.js.map +1 -1
  52. package/_cjs/tempo/Transaction.js +2 -1
  53. package/_cjs/tempo/Transaction.js.map +1 -1
  54. package/_cjs/tempo/chainConfig.js +10 -13
  55. package/_cjs/tempo/chainConfig.js.map +1 -1
  56. package/_cjs/tempo/internal/relay/autoSwap.js +200 -0
  57. package/_cjs/tempo/internal/relay/autoSwap.js.map +1 -0
  58. package/_cjs/tempo/internal/relay/error.js +5 -1
  59. package/_cjs/tempo/internal/relay/error.js.map +1 -1
  60. package/_cjs/tempo/internal/relay/feePayer.js +18 -5
  61. package/_cjs/tempo/internal/relay/feePayer.js.map +1 -1
  62. package/_cjs/tempo/internal/relay/feeToken.js +14 -1
  63. package/_cjs/tempo/internal/relay/feeToken.js.map +1 -1
  64. package/_cjs/tempo/internal/relay/simulate.js +57 -15
  65. package/_cjs/tempo/internal/relay/simulate.js.map +1 -1
  66. package/_cjs/utils/abi/decodeEventLog.js +57 -7
  67. package/_cjs/utils/abi/decodeEventLog.js.map +1 -1
  68. package/_cjs/utils/abi/getAbiItem.js +27 -6
  69. package/_cjs/utils/abi/getAbiItem.js.map +1 -1
  70. package/_cjs/utils/abi/parseEventLogs.js +27 -4
  71. package/_cjs/utils/abi/parseEventLogs.js.map +1 -1
  72. package/_cjs/utils/authorization/recoverAuthorizationAddress.js +9 -2
  73. package/_cjs/utils/authorization/recoverAuthorizationAddress.js.map +1 -1
  74. package/_cjs/utils/authorization/verifyAuthorization.js +14 -4
  75. package/_cjs/utils/authorization/verifyAuthorization.js.map +1 -1
  76. package/_cjs/utils/ccip.js +134 -28
  77. package/_cjs/utils/ccip.js.map +1 -1
  78. package/_cjs/utils/ccipTunnel.js +5 -1
  79. package/_cjs/utils/ccipTunnel.js.map +1 -1
  80. package/_cjs/utils/ens/localBatchGatewayRequest.js +55 -5
  81. package/_cjs/utils/ens/localBatchGatewayRequest.js.map +1 -1
  82. package/_cjs/utils/internal/http.js +79 -0
  83. package/_cjs/utils/internal/http.js.map +1 -0
  84. package/_cjs/utils/nonceManager.js.map +1 -1
  85. package/_cjs/utils/rpc/http.js +3 -73
  86. package/_cjs/utils/rpc/http.js.map +1 -1
  87. package/_cjs/utils/transaction/assertRequest.js +2 -2
  88. package/_cjs/utils/transaction/assertRequest.js.map +1 -1
  89. package/_cjs/utils/transaction/assertTransaction.js +2 -2
  90. package/_cjs/utils/transaction/assertTransaction.js.map +1 -1
  91. package/_cjs/utils/transaction/parseTransaction.js +21 -7
  92. package/_cjs/utils/transaction/parseTransaction.js.map +1 -1
  93. package/_cjs/utils/typedData.js +19 -6
  94. package/_cjs/utils/typedData.js.map +1 -1
  95. package/_esm/account-abstraction/utils/formatters/userOperationReceipt.js +2 -0
  96. package/_esm/account-abstraction/utils/formatters/userOperationReceipt.js.map +1 -1
  97. package/_esm/actions/public/estimateGas.js +10 -5
  98. package/_esm/actions/public/estimateGas.js.map +1 -1
  99. package/_esm/actions/public/fillTransaction.js +2 -0
  100. package/_esm/actions/public/fillTransaction.js.map +1 -1
  101. package/_esm/actions/public/getFilterChanges.js +1 -0
  102. package/_esm/actions/public/getFilterChanges.js.map +1 -1
  103. package/_esm/actions/public/getFilterLogs.js +1 -0
  104. package/_esm/actions/public/getFilterLogs.js.map +1 -1
  105. package/_esm/actions/public/watchBlockNumber.js +5 -1
  106. package/_esm/actions/public/watchBlockNumber.js.map +1 -1
  107. package/_esm/actions/public/watchBlocks.js +28 -8
  108. package/_esm/actions/public/watchBlocks.js.map +1 -1
  109. package/_esm/actions/public/watchContractEvent.js +15 -5
  110. package/_esm/actions/public/watchContractEvent.js.map +1 -1
  111. package/_esm/actions/public/watchEvent.js +11 -2
  112. package/_esm/actions/public/watchEvent.js.map +1 -1
  113. package/_esm/actions/wallet/prepareTransactionRequest.js +3 -2
  114. package/_esm/actions/wallet/prepareTransactionRequest.js.map +1 -1
  115. package/_esm/actions/wallet/sendTransaction.js +6 -2
  116. package/_esm/actions/wallet/sendTransaction.js.map +1 -1
  117. package/_esm/actions/wallet/sendTransactionSync.js +59 -8
  118. package/_esm/actions/wallet/sendTransactionSync.js.map +1 -1
  119. package/_esm/chains/definitions/hashKeyChain.js +4 -4
  120. package/_esm/chains/definitions/hashKeyChain.js.map +1 -1
  121. package/_esm/chains/definitions/hashkeyChainTestnet.js +4 -4
  122. package/_esm/chains/definitions/hashkeyChainTestnet.js.map +1 -1
  123. package/_esm/chains/definitions/turkchain.js +23 -0
  124. package/_esm/chains/definitions/turkchain.js.map +1 -0
  125. package/_esm/chains/definitions/zksync.js +1 -1
  126. package/_esm/chains/definitions/zksync.js.map +1 -1
  127. package/_esm/chains/index.js +1 -0
  128. package/_esm/chains/index.js.map +1 -1
  129. package/_esm/clients/createClient.js.map +1 -1
  130. package/_esm/clients/transports/fallback.js +8 -0
  131. package/_esm/clients/transports/fallback.js.map +1 -1
  132. package/_esm/errors/node.js +10 -4
  133. package/_esm/errors/node.js.map +1 -1
  134. package/_esm/errors/typedData.js +5 -2
  135. package/_esm/errors/typedData.js.map +1 -1
  136. package/_esm/errors/version.js +1 -1
  137. package/_esm/index.js +1 -1
  138. package/_esm/index.js.map +1 -1
  139. package/_esm/tempo/Account.js +122 -11
  140. package/_esm/tempo/Account.js.map +1 -1
  141. package/_esm/tempo/Formatters.js +5 -2
  142. package/_esm/tempo/Formatters.js.map +1 -1
  143. package/_esm/tempo/Relay.js +20 -0
  144. package/_esm/tempo/Relay.js.map +1 -1
  145. package/_esm/tempo/Transaction.js +2 -0
  146. package/_esm/tempo/Transaction.js.map +1 -1
  147. package/_esm/tempo/chainConfig.js +20 -14
  148. package/_esm/tempo/chainConfig.js.map +1 -1
  149. package/_esm/tempo/internal/relay/autoSwap.js +218 -0
  150. package/_esm/tempo/internal/relay/autoSwap.js.map +1 -0
  151. package/_esm/tempo/internal/relay/error.js +6 -2
  152. package/_esm/tempo/internal/relay/error.js.map +1 -1
  153. package/_esm/tempo/internal/relay/feePayer.js +24 -7
  154. package/_esm/tempo/internal/relay/feePayer.js.map +1 -1
  155. package/_esm/tempo/internal/relay/feeToken.js +17 -3
  156. package/_esm/tempo/internal/relay/feeToken.js.map +1 -1
  157. package/_esm/tempo/internal/relay/simulate.js +68 -17
  158. package/_esm/tempo/internal/relay/simulate.js.map +1 -1
  159. package/_esm/utils/abi/decodeEventLog.js +69 -7
  160. package/_esm/utils/abi/decodeEventLog.js.map +1 -1
  161. package/_esm/utils/abi/getAbiItem.js +34 -6
  162. package/_esm/utils/abi/getAbiItem.js.map +1 -1
  163. package/_esm/utils/abi/parseEventLogs.js +43 -10
  164. package/_esm/utils/abi/parseEventLogs.js.map +1 -1
  165. package/_esm/utils/authorization/recoverAuthorizationAddress.js +11 -2
  166. package/_esm/utils/authorization/recoverAuthorizationAddress.js.map +1 -1
  167. package/_esm/utils/authorization/verifyAuthorization.js +15 -4
  168. package/_esm/utils/authorization/verifyAuthorization.js.map +1 -1
  169. package/_esm/utils/ccip.js +163 -31
  170. package/_esm/utils/ccip.js.map +1 -1
  171. package/_esm/utils/ccipTunnel.js +5 -1
  172. package/_esm/utils/ccipTunnel.js.map +1 -1
  173. package/_esm/utils/ens/localBatchGatewayRequest.js +69 -4
  174. package/_esm/utils/ens/localBatchGatewayRequest.js.map +1 -1
  175. package/_esm/utils/internal/http.js +83 -0
  176. package/_esm/utils/internal/http.js.map +1 -0
  177. package/_esm/utils/nonceManager.js.map +1 -1
  178. package/_esm/utils/rpc/http.js +1 -75
  179. package/_esm/utils/rpc/http.js.map +1 -1
  180. package/_esm/utils/transaction/assertRequest.js +2 -2
  181. package/_esm/utils/transaction/assertRequest.js.map +1 -1
  182. package/_esm/utils/transaction/assertTransaction.js +2 -2
  183. package/_esm/utils/transaction/assertTransaction.js.map +1 -1
  184. package/_esm/utils/transaction/parseTransaction.js +24 -7
  185. package/_esm/utils/transaction/parseTransaction.js.map +1 -1
  186. package/_esm/utils/typedData.js +25 -8
  187. package/_esm/utils/typedData.js.map +1 -1
  188. package/_types/account-abstraction/utils/formatters/userOperationReceipt.d.ts.map +1 -1
  189. package/_types/actions/public/estimateGas.d.ts.map +1 -1
  190. package/_types/actions/public/fillTransaction.d.ts.map +1 -1
  191. package/_types/actions/public/getFilterChanges.d.ts.map +1 -1
  192. package/_types/actions/public/getFilterLogs.d.ts.map +1 -1
  193. package/_types/actions/public/watchBlockNumber.d.ts +6 -2
  194. package/_types/actions/public/watchBlockNumber.d.ts.map +1 -1
  195. package/_types/actions/public/watchBlocks.d.ts +7 -2
  196. package/_types/actions/public/watchBlocks.d.ts.map +1 -1
  197. package/_types/actions/public/watchContractEvent.d.ts.map +1 -1
  198. package/_types/actions/public/watchEvent.d.ts.map +1 -1
  199. package/_types/actions/wallet/prepareTransactionRequest.d.ts.map +1 -1
  200. package/_types/actions/wallet/sendTransaction.d.ts.map +1 -1
  201. package/_types/actions/wallet/sendTransactionSync.d.ts.map +1 -1
  202. package/_types/chains/definitions/hashKeyChain.d.ts +4 -4
  203. package/_types/chains/definitions/hashkeyChainTestnet.d.ts +4 -4
  204. package/_types/chains/definitions/turkchain.d.ts +53 -0
  205. package/_types/chains/definitions/turkchain.d.ts.map +1 -0
  206. package/_types/chains/definitions/zksync.d.ts +1 -1
  207. package/_types/chains/index.d.ts +1 -0
  208. package/_types/chains/index.d.ts.map +1 -1
  209. package/_types/clients/createClient.d.ts +6 -0
  210. package/_types/clients/createClient.d.ts.map +1 -1
  211. package/_types/clients/transports/fallback.d.ts.map +1 -1
  212. package/_types/errors/node.d.ts.map +1 -1
  213. package/_types/errors/typedData.d.ts.map +1 -1
  214. package/_types/errors/version.d.ts +1 -1
  215. package/_types/index.d.ts +1 -1
  216. package/_types/index.d.ts.map +1 -1
  217. package/_types/tempo/Account.d.ts +78 -5
  218. package/_types/tempo/Account.d.ts.map +1 -1
  219. package/_types/tempo/Capabilities.d.ts +32 -2
  220. package/_types/tempo/Capabilities.d.ts.map +1 -1
  221. package/_types/tempo/Relay.d.ts +27 -1
  222. package/_types/tempo/Relay.d.ts.map +1 -1
  223. package/_types/tempo/Transaction.d.ts +2 -0
  224. package/_types/tempo/Transaction.d.ts.map +1 -1
  225. package/_types/tempo/actions/accessKey.d.ts +2 -2
  226. package/_types/tempo/chainConfig.d.ts.map +1 -1
  227. package/_types/tempo/internal/relay/autoSwap.d.ts +3 -0
  228. package/_types/tempo/internal/relay/autoSwap.d.ts.map +1 -0
  229. package/_types/tempo/internal/relay/error.d.ts.map +1 -1
  230. package/_types/tempo/internal/relay/feePayer.d.ts.map +1 -1
  231. package/_types/tempo/internal/relay/feeToken.d.ts.map +1 -1
  232. package/_types/tempo/internal/relay/simulate.d.ts +4 -0
  233. package/_types/tempo/internal/relay/simulate.d.ts.map +1 -1
  234. package/_types/tempo/internal/relay/utils.d.ts +8 -8
  235. package/_types/utils/abi/decodeEventLog.d.ts +13 -1
  236. package/_types/utils/abi/decodeEventLog.d.ts.map +1 -1
  237. package/_types/utils/abi/getAbiItem.d.ts.map +1 -1
  238. package/_types/utils/abi/parseEventLogs.d.ts.map +1 -1
  239. package/_types/utils/authorization/recoverAuthorizationAddress.d.ts +2 -1
  240. package/_types/utils/authorization/recoverAuthorizationAddress.d.ts.map +1 -1
  241. package/_types/utils/authorization/verifyAuthorization.d.ts.map +1 -1
  242. package/_types/utils/ccip.d.ts +24 -4
  243. package/_types/utils/ccip.d.ts.map +1 -1
  244. package/_types/utils/ccipTunnel.d.ts.map +1 -1
  245. package/_types/utils/ens/localBatchGatewayRequest.d.ts +26 -0
  246. package/_types/utils/ens/localBatchGatewayRequest.d.ts.map +1 -1
  247. package/_types/utils/internal/http.d.ts +16 -0
  248. package/_types/utils/internal/http.d.ts.map +1 -0
  249. package/_types/utils/nonceManager.d.ts +15 -1
  250. package/_types/utils/nonceManager.d.ts.map +1 -1
  251. package/_types/utils/rpc/http.d.ts.map +1 -1
  252. package/_types/utils/transaction/parseTransaction.d.ts.map +1 -1
  253. package/_types/utils/typedData.d.ts.map +1 -1
  254. package/account-abstraction/utils/formatters/userOperationReceipt.ts +1 -0
  255. package/actions/public/estimateGas.ts +12 -5
  256. package/actions/public/fillTransaction.ts +2 -0
  257. package/actions/public/getFilterChanges.ts +1 -0
  258. package/actions/public/getFilterLogs.ts +1 -0
  259. package/actions/public/watchBlockNumber.ts +11 -2
  260. package/actions/public/watchBlocks.ts +46 -14
  261. package/actions/public/watchContractEvent.ts +22 -4
  262. package/actions/public/watchEvent.ts +17 -1
  263. package/actions/wallet/prepareTransactionRequest.ts +6 -2
  264. package/actions/wallet/sendTransaction.ts +9 -3
  265. package/actions/wallet/sendTransactionSync.ts +74 -12
  266. package/chains/definitions/hashKeyChain.ts +4 -4
  267. package/chains/definitions/hashkeyChainTestnet.ts +4 -4
  268. package/chains/definitions/turkchain.ts +23 -0
  269. package/chains/definitions/zksync.ts +1 -1
  270. package/chains/index.ts +1 -0
  271. package/clients/createClient.ts +6 -0
  272. package/clients/transports/fallback.ts +11 -0
  273. package/errors/node.ts +11 -5
  274. package/errors/typedData.ts +5 -2
  275. package/errors/version.ts +1 -1
  276. package/index.ts +2 -0
  277. package/package.json +1 -1
  278. package/tempo/Account.ts +203 -17
  279. package/tempo/Capabilities.ts +34 -2
  280. package/tempo/Formatters.ts +5 -5
  281. package/tempo/Relay.ts +32 -1
  282. package/tempo/Transaction.ts +3 -0
  283. package/tempo/actions/accessKey.ts +2 -2
  284. package/tempo/chainConfig.ts +22 -14
  285. package/tempo/internal/relay/autoSwap.ts +263 -0
  286. package/tempo/internal/relay/error.ts +7 -2
  287. package/tempo/internal/relay/feePayer.ts +30 -7
  288. package/tempo/internal/relay/feeToken.ts +21 -3
  289. package/tempo/internal/relay/simulate.ts +106 -19
  290. package/utils/abi/decodeEventLog.ts +97 -10
  291. package/utils/abi/getAbiItem.ts +35 -5
  292. package/utils/abi/parseEventLogs.ts +48 -11
  293. package/utils/authorization/recoverAuthorizationAddress.ts +18 -2
  294. package/utils/authorization/verifyAuthorization.ts +12 -7
  295. package/utils/ccip.ts +199 -33
  296. package/utils/ccipTunnel.ts +5 -1
  297. package/utils/ens/localBatchGatewayRequest.ts +82 -4
  298. package/utils/internal/http.ts +92 -0
  299. package/utils/nonceManager.ts +16 -1
  300. package/utils/rpc/http.ts +1 -83
  301. package/utils/transaction/assertRequest.ts +2 -2
  302. package/utils/transaction/assertTransaction.ts +2 -2
  303. package/utils/transaction/parseTransaction.ts +32 -7
  304. package/utils/typedData.ts +31 -8
@@ -57,8 +57,8 @@ function assertTransactionEIP1559(transaction) {
57
57
  throw new address_js_1.InvalidAddressError({ address: to });
58
58
  if (maxFeePerGas && maxFeePerGas > number_js_1.maxUint256)
59
59
  throw new node_js_1.FeeCapTooHighError({ maxFeePerGas });
60
- if (maxPriorityFeePerGas &&
61
- maxFeePerGas &&
60
+ if (typeof maxPriorityFeePerGas === 'bigint' &&
61
+ typeof maxFeePerGas === 'bigint' &&
62
62
  maxPriorityFeePerGas > maxFeePerGas)
63
63
  throw new node_js_1.TipAboveFeeCapError({ maxFeePerGas, maxPriorityFeePerGas });
64
64
  }
@@ -1 +1 @@
1
- {"version":3,"file":"assertTransaction.js","sourceRoot":"","sources":["../../../utils/transaction/assertTransaction.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"assertTransaction.js","sourceRoot":"","sources":["../../../utils/transaction/assertTransaction.ts"],"names":[],"mappings":"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"}
@@ -68,10 +68,12 @@ function parseTransactionEIP7702(serializedTransaction) {
68
68
  transaction.nonce = nonce === '0x' ? 0 : (0, fromHex_js_1.hexToNumber)(nonce);
69
69
  if ((0, isHex_js_1.isHex)(value) && value !== '0x')
70
70
  transaction.value = (0, fromHex_js_1.hexToBigInt)(value);
71
- if ((0, isHex_js_1.isHex)(maxFeePerGas) && maxFeePerGas !== '0x')
72
- transaction.maxFeePerGas = (0, fromHex_js_1.hexToBigInt)(maxFeePerGas);
73
71
  if ((0, isHex_js_1.isHex)(maxPriorityFeePerGas) && maxPriorityFeePerGas !== '0x')
74
72
  transaction.maxPriorityFeePerGas = (0, fromHex_js_1.hexToBigInt)(maxPriorityFeePerGas);
73
+ if ((0, isHex_js_1.isHex)(maxFeePerGas) &&
74
+ (maxFeePerGas !== '0x' || transaction.maxPriorityFeePerGas))
75
+ transaction.maxFeePerGas =
76
+ maxFeePerGas === '0x' ? 0n : (0, fromHex_js_1.hexToBigInt)(maxFeePerGas);
75
77
  if (accessList.length !== 0 && accessList !== '0x')
76
78
  transaction.accessList = parseAccessList(accessList);
77
79
  if (authorizationList.length !== 0 && authorizationList !== '0x')
@@ -132,10 +134,12 @@ function parseTransactionEIP4844(serializedTransaction) {
132
134
  transaction.value = (0, fromHex_js_1.hexToBigInt)(value);
133
135
  if ((0, isHex_js_1.isHex)(maxFeePerBlobGas) && maxFeePerBlobGas !== '0x')
134
136
  transaction.maxFeePerBlobGas = (0, fromHex_js_1.hexToBigInt)(maxFeePerBlobGas);
135
- if ((0, isHex_js_1.isHex)(maxFeePerGas) && maxFeePerGas !== '0x')
136
- transaction.maxFeePerGas = (0, fromHex_js_1.hexToBigInt)(maxFeePerGas);
137
137
  if ((0, isHex_js_1.isHex)(maxPriorityFeePerGas) && maxPriorityFeePerGas !== '0x')
138
138
  transaction.maxPriorityFeePerGas = (0, fromHex_js_1.hexToBigInt)(maxPriorityFeePerGas);
139
+ if ((0, isHex_js_1.isHex)(maxFeePerGas) &&
140
+ (maxFeePerGas !== '0x' || transaction.maxPriorityFeePerGas))
141
+ transaction.maxFeePerGas =
142
+ maxFeePerGas === '0x' ? 0n : (0, fromHex_js_1.hexToBigInt)(maxFeePerGas);
139
143
  if (accessList.length !== 0 && accessList !== '0x')
140
144
  transaction.accessList = parseAccessList(accessList);
141
145
  if (blobs && commitments && proofs)
@@ -190,10 +194,12 @@ function parseTransactionEIP1559(serializedTransaction) {
190
194
  transaction.nonce = nonce === '0x' ? 0 : (0, fromHex_js_1.hexToNumber)(nonce);
191
195
  if ((0, isHex_js_1.isHex)(value) && value !== '0x')
192
196
  transaction.value = (0, fromHex_js_1.hexToBigInt)(value);
193
- if ((0, isHex_js_1.isHex)(maxFeePerGas) && maxFeePerGas !== '0x')
194
- transaction.maxFeePerGas = (0, fromHex_js_1.hexToBigInt)(maxFeePerGas);
195
197
  if ((0, isHex_js_1.isHex)(maxPriorityFeePerGas) && maxPriorityFeePerGas !== '0x')
196
198
  transaction.maxPriorityFeePerGas = (0, fromHex_js_1.hexToBigInt)(maxPriorityFeePerGas);
199
+ if ((0, isHex_js_1.isHex)(maxFeePerGas) &&
200
+ (maxFeePerGas !== '0x' || transaction.maxPriorityFeePerGas))
201
+ transaction.maxFeePerGas =
202
+ maxFeePerGas === '0x' ? 0n : (0, fromHex_js_1.hexToBigInt)(maxFeePerGas);
197
203
  if (accessList.length !== 0 && accessList !== '0x')
198
204
  transaction.accessList = parseAccessList(accessList);
199
205
  (0, assertTransaction_js_1.assertTransactionEIP1559)(transaction);
@@ -332,11 +338,19 @@ function parseAuthorizationList(serializedAuthorizationList) {
332
338
  const authorizationList = [];
333
339
  for (let i = 0; i < serializedAuthorizationList.length; i++) {
334
340
  const [chainId, address, nonce, yParity, r, s] = serializedAuthorizationList[i];
341
+ const yParity_ = yParity === '0x' ? 0n : (0, fromHex_js_1.hexToBigInt)(yParity);
342
+ const signature = yParity_ > 1n && yParity_ < 256n
343
+ ? {
344
+ r: (0, pad_js_1.padHex)(r, { size: 32 }),
345
+ s: (0, pad_js_1.padHex)(s, { size: 32 }),
346
+ yParity: Number(yParity_),
347
+ }
348
+ : parseEIP155Signature([yParity, r, s]);
335
349
  authorizationList.push({
336
350
  address,
337
351
  chainId: chainId === '0x' ? 0 : (0, fromHex_js_1.hexToNumber)(chainId),
338
352
  nonce: nonce === '0x' ? 0 : (0, fromHex_js_1.hexToNumber)(nonce),
339
- ...parseEIP155Signature([yParity, r, s]),
353
+ ...signature,
340
354
  });
341
355
  }
342
356
  return authorizationList;
@@ -1 +1 @@
1
- {"version":3,"file":"parseTransaction.js","sourceRoot":"","sources":["../../../utils/transaction/parseTransaction.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"parseTransaction.js","sourceRoot":"","sources":["../../../utils/transaction/parseTransaction.ts"],"names":[],"mappings":"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"}
@@ -44,9 +44,6 @@ function validateTypedData(parameters) {
44
44
  for (const param of struct) {
45
45
  const { name, type } = param;
46
46
  const value = data[name];
47
- const baseType = type.replace(/(\[[0-9]*\])+$/, '');
48
- if (baseType === 'int' || baseType === 'uint')
49
- throw new typedData_js_1.InvalidTypedDataTypeError({ type });
50
47
  const integerMatch = type.match(regex_js_1.integerRegex);
51
48
  if (integerMatch &&
52
49
  (typeof value === 'number' || typeof value === 'bigint')) {
@@ -67,13 +64,15 @@ function validateTypedData(parameters) {
67
64
  givenSize: (0, size_js_1.size)(value),
68
65
  });
69
66
  }
70
- const struct = types[type];
71
- if (struct)
72
- validateData(struct, value);
67
+ if (Object.hasOwn(types, type))
68
+ validateData(types[type], value);
73
69
  }
74
70
  };
75
71
  for (const type of Object.keys(types))
76
72
  validateReference(type);
73
+ for (const struct of Object.values(types))
74
+ for (const field of struct ?? [])
75
+ validateField(field.type, types);
77
76
  if (types.EIP712Domain && domain) {
78
77
  if (typeof domain !== 'object')
79
78
  throw new typedData_js_1.InvalidDomainError({ domain });
@@ -110,6 +109,20 @@ function domainSeparator({ domain }) {
110
109
  },
111
110
  });
112
111
  }
112
+ function validateField(type, types) {
113
+ const baseType = type.replace(/(\[[0-9]*\])+$/, '');
114
+ if (baseType === 'int' || baseType === 'uint')
115
+ throw new typedData_js_1.InvalidTypedDataTypeError({ type });
116
+ if (!Object.hasOwn(types, baseType) && !isSolidityType(baseType))
117
+ throw new typedData_js_1.InvalidTypedDataTypeError({ type });
118
+ }
119
+ function isSolidityType(type) {
120
+ return (type === 'address' ||
121
+ type === 'bool' ||
122
+ type === 'string' ||
123
+ regex_js_1.bytesRegex.test(type) ||
124
+ regex_js_1.integerRegex.test(type));
125
+ }
113
126
  function validateReference(type) {
114
127
  if (!/^[A-Za-z0-9_$]+$/.test(type) ||
115
128
  type === 'address' ||
@@ -1 +1 @@
1
- {"version":3,"file":"typedData.js","sourceRoot":"","sources":["../../utils/typedData.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"typedData.js","sourceRoot":"","sources":["../../utils/typedData.ts"],"names":[],"mappings":"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"}
@@ -8,6 +8,8 @@ export function formatUserOperationReceipt(parameters) {
8
8
  receipt.actualGasUsed = BigInt(parameters.actualGasUsed);
9
9
  if (parameters.logs)
10
10
  receipt.logs = parameters.logs.map((log) => formatLog(log));
11
+ if (parameters.nonce)
12
+ receipt.nonce = BigInt(parameters.nonce);
11
13
  if (parameters.receipt)
12
14
  receipt.receipt = formatTransactionReceipt(receipt.receipt);
13
15
  return receipt;
@@ -1 +1 @@
1
- {"version":3,"file":"userOperationReceipt.js","sourceRoot":"","sources":["../../../../account-abstraction/utils/formatters/userOperationReceipt.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAC5D,OAAO,EAAE,wBAAwB,EAAE,MAAM,iDAAiD,CAAA;AAM1F,MAAM,UAAU,0BAA0B,CACxC,UAAmC;IAEnC,MAAM,OAAO,GAAG,EAAE,GAAG,UAAU,EAAqC,CAAA;IAEpE,IAAI,UAAU,CAAC,aAAa;QAC1B,OAAO,CAAC,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;IAC1D,IAAI,UAAU,CAAC,aAAa;QAC1B,OAAO,CAAC,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;IAC1D,IAAI,UAAU,CAAC,IAAI;QACjB,OAAO,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAQ,CAAA;IACpE,IAAI,UAAU,CAAC,OAAO;QACpB,OAAO,CAAC,OAAO,GAAG,wBAAwB,CAAC,OAAO,CAAC,OAAc,CAAC,CAAA;IAEpE,OAAO,OAAO,CAAA;AAChB,CAAC"}
1
+ {"version":3,"file":"userOperationReceipt.js","sourceRoot":"","sources":["../../../../account-abstraction/utils/formatters/userOperationReceipt.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAC5D,OAAO,EAAE,wBAAwB,EAAE,MAAM,iDAAiD,CAAA;AAM1F,MAAM,UAAU,0BAA0B,CACxC,UAAmC;IAEnC,MAAM,OAAO,GAAG,EAAE,GAAG,UAAU,EAAqC,CAAA;IAEpE,IAAI,UAAU,CAAC,aAAa;QAC1B,OAAO,CAAC,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;IAC1D,IAAI,UAAU,CAAC,aAAa;QAC1B,OAAO,CAAC,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;IAC1D,IAAI,UAAU,CAAC,IAAI;QACjB,OAAO,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAQ,CAAA;IACpE,IAAI,UAAU,CAAC,KAAK;QAAE,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;IAC9D,IAAI,UAAU,CAAC,OAAO;QACpB,OAAO,CAAC,OAAO,GAAG,wBAAwB,CAAC,OAAO,CAAC,OAAc,CAAC,CAAA;IAEpE,OAAO,OAAO,CAAA;AAChB,CAAC"}
@@ -36,12 +36,16 @@ import { prepareTransactionRequest, } from '../wallet/prepareTransactionRequest.
36
36
  export async function estimateGas(client, args) {
37
37
  const { account: account_ = client.account, prepare = true } = args;
38
38
  const account = account_ ? parseAccount(account_) : undefined;
39
+ // `eth_fillTransaction` cannot apply block context or state overrides, so a
40
+ // gas limit filled during preparation is only usable without them.
41
+ const hasContext = args.stateOverride !== undefined ||
42
+ typeof args.blockNumber === 'bigint' ||
43
+ args.blockTag !== undefined;
39
44
  const parameters = (() => {
40
45
  if (Array.isArray(prepare))
41
46
  return prepare;
42
- // Some RPC Providers do not compute versioned hashes from blobs. We will need
43
- // to compute them.
44
- if (account?.type !== 'local')
47
+ // Some RPC providers do not compute versioned hashes from blobs.
48
+ if (account?.type !== 'local' || hasContext)
45
49
  return ['blobVersionedHashes'];
46
50
  return undefined;
47
51
  })();
@@ -71,8 +75,9 @@ export async function estimateGas(client, args) {
71
75
  // If we get `gas` back from the prepared transaction request, which is
72
76
  // different from the `gas` we provided, it was likely filled by other means
73
77
  // during request preparation (e.g. `eth_fillTransaction` or `chain.transactionRequest.prepare`).
74
- // (e.g. `eth_fillTransaction` or `chain.transactionRequest.prepare`).
75
- if (gas && args.gas !== gas)
78
+ // Fee payer sponsorship and explicit `prepare` parameters can still fill
79
+ // gas, which ignores block context and state overrides.
80
+ if (gas && args.gas !== gas && !hasContext)
76
81
  return gas;
77
82
  const blockNumberHex = typeof blockNumber === 'bigint' ? numberToHex(blockNumber) : undefined;
78
83
  const block = blockNumberHex || blockTag;
@@ -1 +1 @@
1
- {"version":3,"file":"estimateGas.js","sourceRoot":"","sources":["../../../actions/public/estimateGas.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"estimateGas.js","sourceRoot":"","sources":["../../../actions/public/estimateGas.ts"],"names":[],"mappings":"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"}
@@ -89,6 +89,8 @@ export async function fillTransaction(client, parameters) {
89
89
  delete transaction.transactionIndex;
90
90
  delete transaction.v;
91
91
  delete transaction.yParity;
92
+ if (typeof transaction.maxFeePerGas !== 'undefined')
93
+ delete transaction.gasPrice;
92
94
  // Rewrite fields.
93
95
  transaction.data = transaction.input;
94
96
  const hasFeePayerSignature = typeof transaction.feePayerSignature !== 'undefined' &&
@@ -1 +1 @@
1
- {"version":3,"file":"fillTransaction.js","sourceRoot":"","sources":["../../../actions/public/fillTransaction.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fillTransaction.js","sourceRoot":"","sources":["../../../actions/public/fillTransaction.ts"],"names":[],"mappings":"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"}
@@ -95,6 +95,7 @@ export async function getFilterChanges(_client, { filter, }) {
95
95
  return formattedLogs;
96
96
  return parseEventLogs({
97
97
  abi: filter.abi,
98
+ eventName: filter.eventName,
98
99
  logs: formattedLogs,
99
100
  strict,
100
101
  });
@@ -1 +1 @@
1
- {"version":3,"file":"getFilterChanges.js","sourceRoot":"","sources":["../../../actions/public/getFilterChanges.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAA;AAElE,OAAO,EAEL,SAAS,GACV,MAAM,+BAA+B,CAAA;AAsCtC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiFG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAUpC,OAAiC,EACjC,EACE,MAAM,GAQP;IAWD,MAAM,MAAM,GAAG,QAAQ,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,CAAA;IAElD,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAChC,MAAM,EAAE,sBAAsB;QAC9B,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;KACpB,CAAC,CAAA;IAEF,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ;QAC7B,OAAO,IAON,CAAA;IAEH,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,GAAa,CAAC,CAAC,CAAA;IACjE,IAAI,CAAC,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG;QACnC,OAAO,aAON,CAAA;IACH,OAAO,cAAc,CAAC;QACpB,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,IAAI,EAAE,aAAa;QACnB,MAAM;KACP,CAOA,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"getFilterChanges.js","sourceRoot":"","sources":["../../../actions/public/getFilterChanges.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAA;AAElE,OAAO,EAEL,SAAS,GACV,MAAM,+BAA+B,CAAA;AAsCtC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiFG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAUpC,OAAiC,EACjC,EACE,MAAM,GAQP;IAWD,MAAM,MAAM,GAAG,QAAQ,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,CAAA;IAElD,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAChC,MAAM,EAAE,sBAAsB;QAC9B,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;KACpB,CAAC,CAAA;IAEF,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ;QAC7B,OAAO,IAON,CAAA;IAEH,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,GAAa,CAAC,CAAC,CAAA;IACjE,IAAI,CAAC,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG;QACnC,OAAO,aAON,CAAA;IACH,OAAO,cAAc,CAAC;QACpB,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,IAAI,EAAE,aAAa;QACnB,MAAM;KACP,CAOA,CAAA;AACH,CAAC"}
@@ -38,6 +38,7 @@ export async function getFilterLogs(_client, { filter, }) {
38
38
  return formattedLogs;
39
39
  return parseEventLogs({
40
40
  abi: filter.abi,
41
+ eventName: filter.eventName,
41
42
  logs: formattedLogs,
42
43
  strict,
43
44
  });
@@ -1 +1 @@
1
- {"version":3,"file":"getFilterLogs.js","sourceRoot":"","sources":["../../../actions/public/getFilterLogs.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAA;AAElE,OAAO,EAEL,SAAS,GACV,MAAM,+BAA+B,CAAA;AAiCtC;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAQjC,OAAiC,EACjC,EACE,MAAM,GAC8D;IAItE,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,KAAK,CAAA;IAErC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAChC,MAAM,EAAE,mBAAmB;QAC3B,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;KACpB,CAAC,CAAA;IAEF,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;IACvD,IAAI,CAAC,MAAM,CAAC,GAAG;QACb,OAAO,aAMN,CAAA;IACH,OAAO,cAAc,CAAC;QACpB,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,IAAI,EAAE,aAAa;QACnB,MAAM;KACP,CAMA,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"getFilterLogs.js","sourceRoot":"","sources":["../../../actions/public/getFilterLogs.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAA;AAElE,OAAO,EAEL,SAAS,GACV,MAAM,+BAA+B,CAAA;AAiCtC;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAQjC,OAAiC,EACjC,EACE,MAAM,GAC8D;IAItE,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,KAAK,CAAA;IAErC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAChC,MAAM,EAAE,mBAAmB;QAC3B,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;KACpB,CAAC,CAAA;IAEF,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;IACvD,IAAI,CAAC,MAAM,CAAC,GAAG;QACb,OAAO,aAMN,CAAA;IACH,OAAO,cAAc,CAAC;QACpB,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,IAAI,EAAE,aAAa;QACnB,MAAM;KACP,CAMA,CAAA;AACH,CAAC"}
@@ -29,7 +29,7 @@ import { getBlockNumber, } from './getBlockNumber.js';
29
29
  * onBlockNumber: (blockNumber) => console.log(blockNumber),
30
30
  * })
31
31
  */
32
- export function watchBlockNumber(client, { emitOnBegin = false, emitMissed = false, onBlockNumber, onError, poll: poll_, pollingInterval = client.pollingInterval, }) {
32
+ export function watchBlockNumber(client, { emitOnBegin = false, emitMissed: emitMissed_, onBlockNumber, onError, poll: poll_, pollingInterval = client.pollingInterval, }) {
33
33
  const enablePolling = (() => {
34
34
  if (typeof poll_ !== 'undefined')
35
35
  return poll_;
@@ -42,6 +42,10 @@ export function watchBlockNumber(client, { emitOnBegin = false, emitMissed = fal
42
42
  return false;
43
43
  return true;
44
44
  })();
45
+ // Polling less than twice per block skips blocks, so emit the missed
46
+ // ones unless told otherwise.
47
+ const blockTime = client.chain?.blockTime;
48
+ const emitMissed = emitMissed_ ?? (blockTime !== undefined && pollingInterval > blockTime / 2);
45
49
  let prevBlockNumber;
46
50
  const pollBlockNumber = () => {
47
51
  const observerId = stringify([
@@ -1 +1 @@
1
- {"version":3,"file":"watchBlockNumber.js","sourceRoot":"","sources":["../../../actions/public/watchBlockNumber.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"watchBlockNumber.js","sourceRoot":"","sources":["../../../actions/public/watchBlockNumber.ts"],"names":[],"mappings":"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"}
@@ -28,7 +28,7 @@ import { getBlock } from './getBlock.js';
28
28
  * onBlock: (block) => console.log(block),
29
29
  * })
30
30
  */
31
- export function watchBlocks(client, { blockTag = client.experimental_blockTag ?? 'latest', emitMissed = false, emitOnBegin = false, onBlock, onError, includeTransactions: includeTransactions_, poll: poll_, pollingInterval = client.pollingInterval, }) {
31
+ export function watchBlocks(client, { blockTag = client.experimental_blockTag ?? 'latest', emitMissed: emitMissed_, emitOnBegin = false, onBlock, onError, includeTransactions: includeTransactions_, poll: poll_, pollingInterval = client.pollingInterval, }) {
32
32
  const enablePolling = (() => {
33
33
  if (typeof poll_ !== 'undefined')
34
34
  return poll_;
@@ -42,6 +42,18 @@ export function watchBlocks(client, { blockTag = client.experimental_blockTag ??
42
42
  return true;
43
43
  })();
44
44
  const includeTransactions = includeTransactions_ ?? false;
45
+ // Polling less than twice per block skips blocks, so emit the missed
46
+ // ones unless told otherwise. `safe` and `finalized` can move by
47
+ // thousands of blocks at once (such as on Arbitrum) at any polling
48
+ // interval, so they emit missed blocks only when asked.
49
+ const blockTime = client.chain?.blockTime;
50
+ const emitMissed = emitMissed_ ??
51
+ ((blockTag === 'latest' || blockTag === 'pending') &&
52
+ blockTime !== undefined &&
53
+ pollingInterval > blockTime / 2);
54
+ // The default catches up at most 100 blocks, so a long gap, such as a
55
+ // device waking from sleep, skips to the latest block.
56
+ const maxMissed = emitMissed_ === undefined ? 100 : Number.POSITIVE_INFINITY;
45
57
  let prevBlock;
46
58
  const pollBlocks = () => {
47
59
  const observerId = stringify([
@@ -51,6 +63,7 @@ export function watchBlocks(client, { blockTag = client.experimental_blockTag ??
51
63
  emitMissed,
52
64
  emitOnBegin,
53
65
  includeTransactions,
66
+ maxMissed,
54
67
  pollingInterval,
55
68
  ]);
56
69
  return observe(observerId, { onBlock, onError }, (emit) => poll(async () => {
@@ -66,14 +79,21 @@ export function watchBlocks(client, { blockTag = client.experimental_blockTag ??
66
79
  return;
67
80
  // If we have missed out on some previous blocks, and the
68
81
  // `emitMissed` flag is truthy, let's emit those blocks.
69
- if (block.number - prevBlock.number > 1 && emitMissed) {
70
- for (let i = prevBlock?.number + 1n; i < block.number; i++) {
71
- const block = (await getAction(client, getBlock, 'getBlock')({
72
- blockNumber: i,
82
+ // Fetch them in parallel batches so catching up takes a few
83
+ // round trips rather than one per block.
84
+ const missed = Number(block.number - prevBlock.number) - 1;
85
+ if (missed > 0 && missed <= maxMissed && emitMissed) {
86
+ const batchSize = 10;
87
+ const start = prevBlock.number + 1n;
88
+ for (let i = 0; i < missed; i += batchSize) {
89
+ const blocks = await Promise.all(Array.from({ length: Math.min(batchSize, missed - i) }, (_, j) => getAction(client, getBlock, 'getBlock')({
90
+ blockNumber: start + BigInt(i + j),
73
91
  includeTransactions,
74
- }));
75
- emit.onBlock(block, prevBlock);
76
- prevBlock = block;
92
+ })));
93
+ for (const block of blocks) {
94
+ emit.onBlock(block, prevBlock);
95
+ prevBlock = block;
96
+ }
77
97
  }
78
98
  }
79
99
  }
@@ -1 +1 @@
1
- {"version":3,"file":"watchBlocks.js","sourceRoot":"","sources":["../../../actions/public/watchBlocks.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,EAAsB,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAC9D,OAAO,EAA2B,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAE7E,OAAO,EAA2B,QAAQ,EAAE,MAAM,eAAe,CAAA;AA6DjE;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,UAAU,WAAW,CAMzB,MAAgC,EAChC,EACE,QAAQ,GAAG,MAAM,CAAC,qBAAqB,IAAI,QAAQ,EACnD,UAAU,GAAG,KAAK,EAClB,WAAW,GAAG,KAAK,EACnB,OAAO,EACP,OAAO,EACP,mBAAmB,EAAE,oBAAoB,EACzC,IAAI,EAAE,KAAK,EACX,eAAe,GAAG,MAAM,CAAC,eAAe,GAC+B;IAEzE,MAAM,aAAa,GAAG,CAAC,GAAG,EAAE;QAC1B,IAAI,OAAO,KAAK,KAAK,WAAW;YAAE,OAAO,KAAK,CAAA;QAC9C,IACE,MAAM,CAAC,SAAS,CAAC,IAAI,KAAK,WAAW;YACrC,MAAM,CAAC,SAAS,CAAC,IAAI,KAAK,KAAK;YAE/B,OAAO,KAAK,CAAA;QACd,IACE,MAAM,CAAC,SAAS,CAAC,IAAI,KAAK,UAAU;YACpC,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,WAAW;gBACzD,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,KAAK,CAAC;YAEvD,OAAO,KAAK,CAAA;QACd,OAAO,IAAI,CAAA;IACb,CAAC,CAAC,EAAE,CAAA;IACJ,MAAM,mBAAmB,GAAG,oBAAoB,IAAI,KAAK,CAAA;IAEzD,IAAI,SAES,CAAA;IAEb,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,MAAM,UAAU,GAAG,SAAS,CAAC;YAC3B,aAAa;YACb,MAAM,CAAC,GAAG;YACV,QAAQ;YACR,UAAU;YACV,WAAW;YACX,mBAAmB;YACnB,eAAe;SAChB,CAAC,CAAA;QAEF,OAAO,OAAO,CAAC,UAAU,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,CACxD,IAAI,CACF,KAAK,IAAI,EAAE;YACT,IAAI,CAAC;gBACH,MAAM,KAAK,GAAG,MAAM,SAAS,CAC3B,MAAM,EACN,QAAQ,EACR,UAAU,CACX,CAAC;oBACA,QAAQ;oBACR,mBAAmB;iBACpB,CAAC,CAAA;gBACF,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI,IAAI,SAAS,EAAE,MAAM,IAAI,IAAI,EAAE,CAAC;oBACvD,2DAA2D;oBAC3D,eAAe;oBACf,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM;wBAAE,OAAM;oBAE7C,yDAAyD;oBACzD,wDAAwD;oBACxD,IAAI,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,EAAE,CAAC;wBACtD,KAAK,IAAI,CAAC,GAAG,SAAS,EAAE,MAAM,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;4BAC3D,MAAM,KAAK,GAAG,CAAC,MAAM,SAAS,CAC5B,MAAM,EACN,QAAQ,EACR,UAAU,CACX,CAAC;gCACA,WAAW,EAAE,CAAC;gCACd,mBAAmB;6BACpB,CAAC,CAA8B,CAAA;4BAChC,IAAI,CAAC,OAAO,CAAC,KAAY,EAAE,SAAgB,CAAC,CAAA;4BAC5C,SAAS,GAAG,KAAK,CAAA;wBACnB,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED;gBACE,qCAAqC;gBACrC,SAAS,EAAE,MAAM,IAAI,IAAI;oBACzB,4DAA4D;oBAC5D,CAAC,QAAQ,KAAK,SAAS,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,CAAC;oBACjD,4EAA4E;oBAC5E,4CAA4C;oBAC5C,CAAC,KAAK,CAAC,MAAM,KAAK,IAAI,IAAI,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,EAC1D,CAAC;oBACD,IAAI,CAAC,OAAO,CAAC,KAAY,EAAE,SAAgB,CAAC,CAAA;oBAC5C,SAAS,GAAG,KAAY,CAAA;gBAC1B,CAAC;YACH,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,CAAC,OAAO,EAAE,CAAC,GAAY,CAAC,CAAA;YAC9B,CAAC;QACH,CAAC,EACD;YACE,WAAW;YACX,QAAQ,EAAE,eAAe;SAC1B,CACF,CACF,CAAA;IACH,CAAC,CAAA;IAED,MAAM,eAAe,GAAG,GAAG,EAAE;QAC3B,IAAI,MAAM,GAAG,IAAI,CAAA;QACjB,IAAI,WAAW,GAAG,IAAI,CAAA;QACtB,IAAI,WAAW,GAAG,GAAG,EAAE,CAAC,CAAC,MAAM,GAAG,KAAK,CAAC,CACvC;QAAA,CAAC,KAAK,IAAI,EAAE;YACX,IAAI,CAAC;gBACH,IAAI,WAAW,EAAE,CAAC;oBAChB,SAAS,CACP,MAAM,EACN,QAAQ,EACR,UAAU,CACX,CAAC;wBACA,QAAQ;wBACR,mBAAmB;qBACpB,CAAC;yBACC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;wBACd,IAAI,CAAC,MAAM;4BAAE,OAAM;wBACnB,IAAI,CAAC,WAAW;4BAAE,OAAM;wBACxB,OAAO,CAAC,KAAY,EAAE,SAAS,CAAC,CAAA;wBAChC,WAAW,GAAG,KAAK,CAAA;oBACrB,CAAC,CAAC;yBACD,KAAK,CAAC,OAAO,CAAC,CAAA;gBACnB,CAAC;gBAED,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE;oBACtB,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;wBACzC,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAChD,CAAC,SAAgC,EAAE,EAAE,CACnC,SAAS,CAAC,MAAM,CAAC,IAAI,KAAK,WAAW;4BACrC,SAAS,CAAC,MAAM,CAAC,IAAI,KAAK,KAAK,CAClC,CAAA;wBACD,IAAI,CAAC,SAAS;4BAAE,OAAO,MAAM,CAAC,SAAS,CAAA;wBACvC,OAAO,SAAS,CAAC,KAAK,CAAA;oBACxB,CAAC;oBACD,OAAO,MAAM,CAAC,SAAS,CAAA;gBACzB,CAAC,CAAC,EAAE,CAAA;gBAEJ,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,MAAM,SAAS,CAAC,SAAS,CAAC;oBAC9D,MAAM,EAAE,CAAC,UAAU,CAAC;oBACpB,KAAK,CAAC,MAAM,CAAC,IAAS;wBACpB,IAAI,CAAC,MAAM;4BAAE,OAAM;wBACnB,MAAM,KAAK,GAAG,CAAC,MAAM,SAAS,CAC5B,MAAM,EACN,QAAQ,EACR,UAAU,CACX,CAAC;4BACA,WAAW,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM;4BAChC,mBAAmB;yBACpB,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAA8B,CAAA;wBAChD,IAAI,CAAC,MAAM;4BAAE,OAAM;wBACnB,OAAO,CAAC,KAAY,EAAE,SAAgB,CAAC,CAAA;wBACvC,WAAW,GAAG,KAAK,CAAA;wBACnB,SAAS,GAAG,KAAK,CAAA;oBACnB,CAAC;oBACD,OAAO,CAAC,KAAY;wBAClB,OAAO,EAAE,CAAC,KAAK,CAAC,CAAA;oBAClB,CAAC;iBACF,CAAC,CAAA;gBACF,WAAW,GAAG,YAAY,CAAA;gBAC1B,IAAI,CAAC,MAAM;oBAAE,WAAW,EAAE,CAAA;YAC5B,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,EAAE,CAAC,GAAY,CAAC,CAAA;YACzB,CAAC;QACH,CAAC,CAAC,EAAE,CAAA;QACJ,OAAO,GAAG,EAAE,CAAC,WAAW,EAAE,CAAA;IAC5B,CAAC,CAAA;IAED,OAAO,aAAa,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACzD,CAAC"}
1
+ {"version":3,"file":"watchBlocks.js","sourceRoot":"","sources":["../../../actions/public/watchBlocks.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,8 @@
1
- import { DecodeLogDataMismatch, DecodeLogTopicsMismatch, } from '../../errors/abi.js';
1
+ import { AbiEventSignatureEmptyTopicsError, AbiEventSignatureNotFoundError, DecodeLogDataMismatch, DecodeLogTopicsMismatch, } from '../../errors/abi.js';
2
2
  import { BaseError } from '../../errors/base.js';
3
3
  import { HttpRequestError, RpcRequestError } from '../../errors/request.js';
4
4
  import { InvalidInputRpcError } from '../../errors/rpc.js';
5
- import { decodeEventLog } from '../../utils/abi/decodeEventLog.js';
5
+ import { AbiEventAmbiguityError, decodeEventLog, } from '../../utils/abi/decodeEventLog.js';
6
6
  import { encodeEventTopics, } from '../../utils/abi/encodeEventTopics.js';
7
7
  import { formatLog } from '../../utils/formatters/log.js';
8
8
  import { getAction } from '../../utils/getAction.js';
@@ -197,6 +197,10 @@ export function watchContractEvent(client, parameters) {
197
197
  }
198
198
  return client.transport;
199
199
  })();
200
+ // A topic filter cannot select an anonymous event, so the
201
+ // subscription can deliver logs that match no requested event. Skip
202
+ // them when the watch names an event, as the polling path does.
203
+ const skipUnmatched = Boolean(eventName || strict_);
200
204
  const topics = eventName
201
205
  ? encodeEventTopics({
202
206
  abi: abi,
@@ -211,19 +215,25 @@ export function watchContractEvent(client, parameters) {
211
215
  return;
212
216
  const log = data.result;
213
217
  try {
214
- const { eventName, args } = decodeEventLog({
218
+ const decoded = decodeEventLog({
215
219
  abi: abi,
216
220
  data: log.data,
221
+ eventName,
217
222
  topics: log.topics,
218
223
  strict: strict_,
219
224
  });
220
225
  const formatted = formatLog(log, {
221
- args,
222
- eventName: eventName,
226
+ args: decoded.args,
227
+ eventName: decoded.eventName,
223
228
  });
224
229
  emit.onLogs([formatted]);
225
230
  }
226
231
  catch (err) {
232
+ if (skipUnmatched &&
233
+ (err instanceof AbiEventAmbiguityError ||
234
+ err instanceof AbiEventSignatureEmptyTopicsError ||
235
+ err instanceof AbiEventSignatureNotFoundError))
236
+ return;
227
237
  let eventName;
228
238
  let isUnnamed;
229
239
  if (err instanceof DecodeLogDataMismatch ||
@@ -1 +1 @@
1
- {"version":3,"file":"watchContractEvent.js","sourceRoot":"","sources":["../../../actions/public/watchContractEvent.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"watchContractEvent.js","sourceRoot":"","sources":["../../../actions/public/watchContractEvent.ts"],"names":[],"mappings":"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"}