viem 2.57.11 → 2.57.13

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 (377) hide show
  1. package/CHANGELOG.md +62 -0
  2. package/_cjs/actions/public/fillTransaction.js +6 -3
  3. package/_cjs/actions/public/fillTransaction.js.map +1 -1
  4. package/_cjs/actions/public/waitForTransactionReceipt.js +83 -23
  5. package/_cjs/actions/public/waitForTransactionReceipt.js.map +1 -1
  6. package/_cjs/actions/public/watchContractEvent.js +58 -29
  7. package/_cjs/actions/public/watchContractEvent.js.map +1 -1
  8. package/_cjs/actions/public/watchEvent.js +58 -28
  9. package/_cjs/actions/public/watchEvent.js.map +1 -1
  10. package/_cjs/actions/token/approve.js +1 -1
  11. package/_cjs/actions/token/approve.js.map +1 -1
  12. package/_cjs/actions/token/getAllowance.js +1 -1
  13. package/_cjs/actions/token/getAllowance.js.map +1 -1
  14. package/_cjs/actions/token/getBalance.js +1 -1
  15. package/_cjs/actions/token/getBalance.js.map +1 -1
  16. package/_cjs/actions/token/getTotalSupply.js +1 -1
  17. package/_cjs/actions/token/getTotalSupply.js.map +1 -1
  18. package/_cjs/actions/token/transfer.js +1 -1
  19. package/_cjs/actions/token/transfer.js.map +1 -1
  20. package/_cjs/actions/wallet/sendCalls.js +1 -1
  21. package/_cjs/actions/wallet/sendCalls.js.map +1 -1
  22. package/_cjs/chains/definitions/molibra.js +21 -0
  23. package/_cjs/chains/definitions/molibra.js.map +1 -0
  24. package/_cjs/chains/definitions/valuechain.js +22 -0
  25. package/_cjs/chains/definitions/valuechain.js.map +1 -0
  26. package/_cjs/chains/definitions/valuechainTestnet.js +23 -0
  27. package/_cjs/chains/definitions/valuechainTestnet.js.map +1 -0
  28. package/_cjs/chains/index.js +13 -7
  29. package/_cjs/chains/index.js.map +1 -1
  30. package/_cjs/clients/decorators/public.js.map +1 -1
  31. package/_cjs/clients/transports/http.js +5 -1
  32. package/_cjs/clients/transports/http.js.map +1 -1
  33. package/_cjs/errors/node.js +1 -1
  34. package/_cjs/errors/node.js.map +1 -1
  35. package/_cjs/errors/request.js +20 -2
  36. package/_cjs/errors/request.js.map +1 -1
  37. package/_cjs/errors/typedData.js +3 -1
  38. package/_cjs/errors/typedData.js.map +1 -1
  39. package/_cjs/errors/version.js +1 -1
  40. package/_cjs/op-stack/abis.js +52 -0
  41. package/_cjs/op-stack/abis.js.map +1 -1
  42. package/_cjs/op-stack/actions/getTimeToFinalize.js +53 -4
  43. package/_cjs/op-stack/actions/getTimeToFinalize.js.map +1 -1
  44. package/_cjs/op-stack/actions/getTimeToProve.js +29 -2
  45. package/_cjs/op-stack/actions/getTimeToProve.js.map +1 -1
  46. package/_cjs/op-stack/actions/getWithdrawalStatus.js +20 -4
  47. package/_cjs/op-stack/actions/getWithdrawalStatus.js.map +1 -1
  48. package/_cjs/op-stack/actions/waitToProve.js +28 -2
  49. package/_cjs/op-stack/actions/waitToProve.js.map +1 -1
  50. package/_cjs/op-stack/errors/withdrawal.js +12 -1
  51. package/_cjs/op-stack/errors/withdrawal.js.map +1 -1
  52. package/_cjs/tempo/Account.js +6 -9
  53. package/_cjs/tempo/Account.js.map +1 -1
  54. package/_cjs/tempo/Addresses.js +1 -2
  55. package/_cjs/tempo/Addresses.js.map +1 -1
  56. package/_cjs/tempo/Formatters.js +13 -2
  57. package/_cjs/tempo/Formatters.js.map +1 -1
  58. package/_cjs/tempo/Relay.js.map +1 -1
  59. package/_cjs/tempo/Transaction.js.map +1 -1
  60. package/_cjs/tempo/accounts/Config.js +22 -12
  61. package/_cjs/tempo/accounts/Config.js.map +1 -1
  62. package/_cjs/tempo/actions/accessKey.js +8 -8
  63. package/_cjs/tempo/actions/accessKey.js.map +1 -1
  64. package/_cjs/tempo/actions/accounts.js +5 -5
  65. package/_cjs/tempo/actions/accounts.js.map +1 -1
  66. package/_cjs/tempo/actions/amm.js +4 -4
  67. package/_cjs/tempo/actions/amm.js.map +1 -1
  68. package/_cjs/tempo/actions/channel.js +7 -7
  69. package/_cjs/tempo/actions/channel.js.map +1 -1
  70. package/_cjs/tempo/actions/dex.js +14 -14
  71. package/_cjs/tempo/actions/dex.js.map +1 -1
  72. package/_cjs/tempo/actions/earn/deployment.js +3 -3
  73. package/_cjs/tempo/actions/earn/deployment.js.map +1 -1
  74. package/_cjs/tempo/actions/earn.js +6 -6
  75. package/_cjs/tempo/actions/earn.js.map +1 -1
  76. package/_cjs/tempo/actions/fee.js +4 -4
  77. package/_cjs/tempo/actions/fee.js.map +1 -1
  78. package/_cjs/tempo/actions/nonce.js +1 -1
  79. package/_cjs/tempo/actions/nonce.js.map +1 -1
  80. package/_cjs/tempo/actions/policy.js +6 -6
  81. package/_cjs/tempo/actions/policy.js.map +1 -1
  82. package/_cjs/tempo/actions/propAmm.js +10 -10
  83. package/_cjs/tempo/actions/propAmm.js.map +1 -1
  84. package/_cjs/tempo/actions/receivePolicy.js +6 -6
  85. package/_cjs/tempo/actions/receivePolicy.js.map +1 -1
  86. package/_cjs/tempo/actions/reward.js +6 -6
  87. package/_cjs/tempo/actions/reward.js.map +1 -1
  88. package/_cjs/tempo/actions/token.js +21 -21
  89. package/_cjs/tempo/actions/token.js.map +1 -1
  90. package/_cjs/tempo/actions/validator.js +11 -11
  91. package/_cjs/tempo/actions/validator.js.map +1 -1
  92. package/_cjs/tempo/actions/virtualAddress.js +2 -2
  93. package/_cjs/tempo/actions/virtualAddress.js.map +1 -1
  94. package/_cjs/tempo/chainConfig.js +11 -4
  95. package/_cjs/tempo/chainConfig.js.map +1 -1
  96. package/_cjs/tempo/internal/relay/accounts.js +42 -7
  97. package/_cjs/tempo/internal/relay/accounts.js.map +1 -1
  98. package/_cjs/tempo/internal/relay/feePayer.js +4 -1
  99. package/_cjs/tempo/internal/relay/feePayer.js.map +1 -1
  100. package/_cjs/utils/abi/getAbiItem.js +33 -12
  101. package/_cjs/utils/abi/getAbiItem.js.map +1 -1
  102. package/_cjs/utils/abi/parseEventLogs.js +18 -10
  103. package/_cjs/utils/abi/parseEventLogs.js.map +1 -1
  104. package/_cjs/utils/authorization/serializeAuthorizationList.js +4 -1
  105. package/_cjs/utils/authorization/serializeAuthorizationList.js.map +1 -1
  106. package/_cjs/utils/buildRequest.js +25 -14
  107. package/_cjs/utils/buildRequest.js.map +1 -1
  108. package/_cjs/utils/data/isHex.js +3 -1
  109. package/_cjs/utils/data/isHex.js.map +1 -1
  110. package/_cjs/utils/hash/normalizeSignature.js +1 -1
  111. package/_cjs/utils/hash/normalizeSignature.js.map +1 -1
  112. package/_cjs/utils/rpc/http.js +24 -4
  113. package/_cjs/utils/rpc/http.js.map +1 -1
  114. package/_cjs/utils/signature/compactSignatureToSignature.js +3 -2
  115. package/_cjs/utils/signature/compactSignatureToSignature.js.map +1 -1
  116. package/_cjs/utils/signature/hashTypedData.js +1 -2
  117. package/_cjs/utils/signature/hashTypedData.js.map +1 -1
  118. package/_cjs/utils/signature/signatureToCompactSignature.js +15 -7
  119. package/_cjs/utils/signature/signatureToCompactSignature.js.map +1 -1
  120. package/_cjs/utils/siwe/createSiweMessage.js +1 -1
  121. package/_cjs/utils/siwe/createSiweMessage.js.map +1 -1
  122. package/_cjs/utils/typedData.js +6 -7
  123. package/_cjs/utils/typedData.js.map +1 -1
  124. package/_cjs/utils/wait.js +1 -1
  125. package/_cjs/utils/wait.js.map +1 -1
  126. package/_esm/actions/public/fillTransaction.js +8 -3
  127. package/_esm/actions/public/fillTransaction.js.map +1 -1
  128. package/_esm/actions/public/waitForTransactionReceipt.js +101 -23
  129. package/_esm/actions/public/waitForTransactionReceipt.js.map +1 -1
  130. package/_esm/actions/public/watchContractEvent.js +73 -36
  131. package/_esm/actions/public/watchContractEvent.js.map +1 -1
  132. package/_esm/actions/public/watchEvent.js +73 -35
  133. package/_esm/actions/public/watchEvent.js.map +1 -1
  134. package/_esm/actions/token/approve.js +1 -1
  135. package/_esm/actions/token/approve.js.map +1 -1
  136. package/_esm/actions/token/getAllowance.js +1 -1
  137. package/_esm/actions/token/getAllowance.js.map +1 -1
  138. package/_esm/actions/token/getBalance.js +1 -1
  139. package/_esm/actions/token/getBalance.js.map +1 -1
  140. package/_esm/actions/token/getTotalSupply.js +1 -1
  141. package/_esm/actions/token/getTotalSupply.js.map +1 -1
  142. package/_esm/actions/token/transfer.js +1 -1
  143. package/_esm/actions/token/transfer.js.map +1 -1
  144. package/_esm/actions/wallet/sendCalls.js +1 -1
  145. package/_esm/actions/wallet/sendCalls.js.map +1 -1
  146. package/_esm/chains/definitions/molibra.js +18 -0
  147. package/_esm/chains/definitions/molibra.js.map +1 -0
  148. package/_esm/chains/definitions/valuechain.js +20 -0
  149. package/_esm/chains/definitions/valuechain.js.map +1 -0
  150. package/_esm/chains/definitions/valuechainTestnet.js +21 -0
  151. package/_esm/chains/definitions/valuechainTestnet.js.map +1 -0
  152. package/_esm/chains/index.js +5 -0
  153. package/_esm/chains/index.js.map +1 -1
  154. package/_esm/clients/decorators/public.js.map +1 -1
  155. package/_esm/clients/transports/http.js +6 -1
  156. package/_esm/clients/transports/http.js.map +1 -1
  157. package/_esm/errors/node.js +1 -1
  158. package/_esm/errors/node.js.map +1 -1
  159. package/_esm/errors/request.js +22 -2
  160. package/_esm/errors/request.js.map +1 -1
  161. package/_esm/errors/typedData.js +3 -1
  162. package/_esm/errors/typedData.js.map +1 -1
  163. package/_esm/errors/version.js +1 -1
  164. package/_esm/op-stack/abis.js +52 -0
  165. package/_esm/op-stack/abis.js.map +1 -1
  166. package/_esm/op-stack/actions/getTimeToFinalize.js +64 -6
  167. package/_esm/op-stack/actions/getTimeToFinalize.js.map +1 -1
  168. package/_esm/op-stack/actions/getTimeToProve.js +30 -2
  169. package/_esm/op-stack/actions/getTimeToProve.js.map +1 -1
  170. package/_esm/op-stack/actions/getWithdrawalStatus.js +24 -5
  171. package/_esm/op-stack/actions/getWithdrawalStatus.js.map +1 -1
  172. package/_esm/op-stack/actions/waitToProve.js +30 -3
  173. package/_esm/op-stack/actions/waitToProve.js.map +1 -1
  174. package/_esm/op-stack/errors/withdrawal.js +10 -0
  175. package/_esm/op-stack/errors/withdrawal.js.map +1 -1
  176. package/_esm/tempo/Account.js +6 -9
  177. package/_esm/tempo/Account.js.map +1 -1
  178. package/_esm/tempo/Addresses.js +0 -2
  179. package/_esm/tempo/Addresses.js.map +1 -1
  180. package/_esm/tempo/Formatters.js +12 -2
  181. package/_esm/tempo/Formatters.js.map +1 -1
  182. package/_esm/tempo/Relay.js.map +1 -1
  183. package/_esm/tempo/Transaction.js.map +1 -1
  184. package/_esm/tempo/accounts/Config.js +28 -16
  185. package/_esm/tempo/accounts/Config.js.map +1 -1
  186. package/_esm/tempo/actions/accessKey.js +8 -8
  187. package/_esm/tempo/actions/accessKey.js.map +1 -1
  188. package/_esm/tempo/actions/accounts.js +7 -7
  189. package/_esm/tempo/actions/accounts.js.map +1 -1
  190. package/_esm/tempo/actions/amm.js +4 -4
  191. package/_esm/tempo/actions/amm.js.map +1 -1
  192. package/_esm/tempo/actions/channel.js +7 -7
  193. package/_esm/tempo/actions/channel.js.map +1 -1
  194. package/_esm/tempo/actions/dex.js +14 -14
  195. package/_esm/tempo/actions/dex.js.map +1 -1
  196. package/_esm/tempo/actions/earn/deployment.js +3 -3
  197. package/_esm/tempo/actions/earn/deployment.js.map +1 -1
  198. package/_esm/tempo/actions/earn.js +6 -6
  199. package/_esm/tempo/actions/earn.js.map +1 -1
  200. package/_esm/tempo/actions/fee.js +4 -4
  201. package/_esm/tempo/actions/fee.js.map +1 -1
  202. package/_esm/tempo/actions/nonce.js +1 -1
  203. package/_esm/tempo/actions/nonce.js.map +1 -1
  204. package/_esm/tempo/actions/policy.js +6 -6
  205. package/_esm/tempo/actions/policy.js.map +1 -1
  206. package/_esm/tempo/actions/propAmm.js +10 -10
  207. package/_esm/tempo/actions/propAmm.js.map +1 -1
  208. package/_esm/tempo/actions/receivePolicy.js +6 -6
  209. package/_esm/tempo/actions/receivePolicy.js.map +1 -1
  210. package/_esm/tempo/actions/reward.js +6 -6
  211. package/_esm/tempo/actions/reward.js.map +1 -1
  212. package/_esm/tempo/actions/token.js +21 -21
  213. package/_esm/tempo/actions/token.js.map +1 -1
  214. package/_esm/tempo/actions/validator.js +11 -11
  215. package/_esm/tempo/actions/validator.js.map +1 -1
  216. package/_esm/tempo/actions/virtualAddress.js +2 -2
  217. package/_esm/tempo/actions/virtualAddress.js.map +1 -1
  218. package/_esm/tempo/chainConfig.js +13 -4
  219. package/_esm/tempo/chainConfig.js.map +1 -1
  220. package/_esm/tempo/internal/relay/accounts.js +44 -7
  221. package/_esm/tempo/internal/relay/accounts.js.map +1 -1
  222. package/_esm/tempo/internal/relay/feePayer.js +4 -1
  223. package/_esm/tempo/internal/relay/feePayer.js.map +1 -1
  224. package/_esm/utils/abi/getAbiItem.js +36 -14
  225. package/_esm/utils/abi/getAbiItem.js.map +1 -1
  226. package/_esm/utils/abi/parseEventLogs.js +25 -11
  227. package/_esm/utils/abi/parseEventLogs.js.map +1 -1
  228. package/_esm/utils/authorization/serializeAuthorizationList.js +7 -1
  229. package/_esm/utils/authorization/serializeAuthorizationList.js.map +1 -1
  230. package/_esm/utils/buildRequest.js +29 -15
  231. package/_esm/utils/buildRequest.js.map +1 -1
  232. package/_esm/utils/data/isHex.js +3 -1
  233. package/_esm/utils/data/isHex.js.map +1 -1
  234. package/_esm/utils/hash/normalizeSignature.js +1 -1
  235. package/_esm/utils/hash/normalizeSignature.js.map +1 -1
  236. package/_esm/utils/hash/toSignature.js +1 -1
  237. package/_esm/utils/hash/toSignatureHash.js +1 -1
  238. package/_esm/utils/rpc/http.js +29 -7
  239. package/_esm/utils/rpc/http.js.map +1 -1
  240. package/_esm/utils/signature/compactSignatureToSignature.js +3 -2
  241. package/_esm/utils/signature/compactSignatureToSignature.js.map +1 -1
  242. package/_esm/utils/signature/hashTypedData.js +1 -2
  243. package/_esm/utils/signature/hashTypedData.js.map +1 -1
  244. package/_esm/utils/signature/signatureToCompactSignature.js +16 -7
  245. package/_esm/utils/signature/signatureToCompactSignature.js.map +1 -1
  246. package/_esm/utils/siwe/createSiweMessage.js +1 -1
  247. package/_esm/utils/siwe/createSiweMessage.js.map +1 -1
  248. package/_esm/utils/typedData.js +12 -8
  249. package/_esm/utils/typedData.js.map +1 -1
  250. package/_esm/utils/wait.js +2 -1
  251. package/_esm/utils/wait.js.map +1 -1
  252. package/_types/actions/getContract.d.ts +1 -1
  253. package/_types/actions/public/fillTransaction.d.ts.map +1 -1
  254. package/_types/actions/public/waitForTransactionReceipt.d.ts +31 -1
  255. package/_types/actions/public/waitForTransactionReceipt.d.ts.map +1 -1
  256. package/_types/actions/public/watchContractEvent.d.ts +1 -1
  257. package/_types/actions/public/watchContractEvent.d.ts.map +1 -1
  258. package/_types/actions/public/watchEvent.d.ts +1 -1
  259. package/_types/actions/public/watchEvent.d.ts.map +1 -1
  260. package/_types/chains/definitions/molibra.d.ts +52 -0
  261. package/_types/chains/definitions/molibra.d.ts.map +1 -0
  262. package/_types/chains/definitions/tempo.d.ts +14 -6
  263. package/_types/chains/definitions/tempo.d.ts.map +1 -1
  264. package/_types/chains/definitions/tempoDevnet.d.ts +14 -6
  265. package/_types/chains/definitions/tempoDevnet.d.ts.map +1 -1
  266. package/_types/chains/definitions/tempoLocalnet.d.ts +14 -6
  267. package/_types/chains/definitions/tempoLocalnet.d.ts.map +1 -1
  268. package/_types/chains/definitions/tempoModerato.d.ts +14 -6
  269. package/_types/chains/definitions/tempoModerato.d.ts.map +1 -1
  270. package/_types/chains/definitions/valuechain.d.ts +53 -0
  271. package/_types/chains/definitions/valuechain.d.ts.map +1 -0
  272. package/_types/chains/definitions/valuechainTestnet.d.ts +53 -0
  273. package/_types/chains/definitions/valuechainTestnet.d.ts.map +1 -0
  274. package/_types/chains/index.d.ts +5 -0
  275. package/_types/chains/index.d.ts.map +1 -1
  276. package/_types/clients/decorators/public.d.ts +5 -2
  277. package/_types/clients/decorators/public.d.ts.map +1 -1
  278. package/_types/clients/transports/http.d.ts.map +1 -1
  279. package/_types/errors/node.d.ts.map +1 -1
  280. package/_types/errors/request.d.ts +7 -1
  281. package/_types/errors/request.d.ts.map +1 -1
  282. package/_types/errors/typedData.d.ts.map +1 -1
  283. package/_types/errors/version.d.ts +1 -1
  284. package/_types/op-stack/abis.d.ts +40 -0
  285. package/_types/op-stack/abis.d.ts.map +1 -1
  286. package/_types/op-stack/actions/getTimeToFinalize.d.ts +3 -2
  287. package/_types/op-stack/actions/getTimeToFinalize.d.ts.map +1 -1
  288. package/_types/op-stack/actions/getTimeToProve.d.ts +3 -1
  289. package/_types/op-stack/actions/getTimeToProve.d.ts.map +1 -1
  290. package/_types/op-stack/actions/getWithdrawalStatus.d.ts +2 -2
  291. package/_types/op-stack/actions/getWithdrawalStatus.d.ts.map +1 -1
  292. package/_types/op-stack/actions/waitToProve.d.ts +3 -1
  293. package/_types/op-stack/actions/waitToProve.d.ts.map +1 -1
  294. package/_types/op-stack/errors/withdrawal.d.ts +8 -0
  295. package/_types/op-stack/errors/withdrawal.d.ts.map +1 -1
  296. package/_types/tempo/Account.d.ts +14 -5
  297. package/_types/tempo/Account.d.ts.map +1 -1
  298. package/_types/tempo/Addresses.d.ts +0 -2
  299. package/_types/tempo/Addresses.d.ts.map +1 -1
  300. package/_types/tempo/Formatters.d.ts +3 -0
  301. package/_types/tempo/Formatters.d.ts.map +1 -1
  302. package/_types/tempo/Relay.d.ts +20 -0
  303. package/_types/tempo/Relay.d.ts.map +1 -1
  304. package/_types/tempo/Transaction.d.ts +7 -2
  305. package/_types/tempo/Transaction.d.ts.map +1 -1
  306. package/_types/tempo/accounts/Config.d.ts +24 -2
  307. package/_types/tempo/accounts/Config.d.ts.map +1 -1
  308. package/_types/tempo/actions/accounts.d.ts +2 -2
  309. package/_types/tempo/chainConfig.d.ts +8 -3
  310. package/_types/tempo/chainConfig.d.ts.map +1 -1
  311. package/_types/tempo/internal/relay/accounts.d.ts.map +1 -1
  312. package/_types/tempo/internal/relay/feePayer.d.ts.map +1 -1
  313. package/_types/utils/abi/getAbiItem.d.ts.map +1 -1
  314. package/_types/utils/abi/parseEventLogs.d.ts.map +1 -1
  315. package/_types/utils/authorization/serializeAuthorizationList.d.ts.map +1 -1
  316. package/_types/utils/buildRequest.d.ts.map +1 -1
  317. package/_types/utils/data/isHex.d.ts +12 -1
  318. package/_types/utils/data/isHex.d.ts.map +1 -1
  319. package/_types/utils/hash/toSignature.d.ts +1 -1
  320. package/_types/utils/hash/toSignatureHash.d.ts +1 -1
  321. package/_types/utils/rpc/http.d.ts +2 -2
  322. package/_types/utils/rpc/http.d.ts.map +1 -1
  323. package/_types/utils/signature/compactSignatureToSignature.d.ts +2 -1
  324. package/_types/utils/signature/compactSignatureToSignature.d.ts.map +1 -1
  325. package/_types/utils/signature/hashTypedData.d.ts.map +1 -1
  326. package/_types/utils/signature/signatureToCompactSignature.d.ts +2 -1
  327. package/_types/utils/signature/signatureToCompactSignature.d.ts.map +1 -1
  328. package/_types/utils/typedData.d.ts.map +1 -1
  329. package/_types/utils/wait.d.ts.map +1 -1
  330. package/actions/getContract.ts +1 -1
  331. package/actions/public/fillTransaction.ts +12 -3
  332. package/actions/public/waitForTransactionReceipt.ts +164 -33
  333. package/actions/public/watchContractEvent.ts +82 -39
  334. package/actions/public/watchEvent.ts +82 -38
  335. package/actions/wallet/sendCalls.ts +1 -1
  336. package/chains/definitions/molibra.ts +18 -0
  337. package/chains/definitions/valuechain.ts +20 -0
  338. package/chains/definitions/valuechainTestnet.ts +21 -0
  339. package/chains/index.ts +5 -0
  340. package/clients/decorators/public.ts +5 -2
  341. package/clients/transports/http.ts +6 -1
  342. package/errors/node.ts +1 -1
  343. package/errors/request.ts +15 -1
  344. package/errors/typedData.ts +3 -1
  345. package/errors/version.ts +1 -1
  346. package/op-stack/abis.ts +52 -0
  347. package/op-stack/actions/getTimeToFinalize.ts +89 -10
  348. package/op-stack/actions/getTimeToProve.ts +43 -2
  349. package/op-stack/actions/getWithdrawalStatus.ts +30 -6
  350. package/op-stack/actions/waitToProve.ts +45 -3
  351. package/op-stack/errors/withdrawal.ts +17 -0
  352. package/package.json +2 -2
  353. package/tempo/Account.ts +20 -22
  354. package/tempo/Addresses.ts +0 -3
  355. package/tempo/Formatters.ts +19 -7
  356. package/tempo/Relay.ts +26 -0
  357. package/tempo/Transaction.ts +10 -2
  358. package/tempo/accounts/Config.ts +40 -25
  359. package/tempo/actions/accounts.ts +2 -2
  360. package/tempo/chainConfig.ts +15 -4
  361. package/tempo/internal/relay/accounts.ts +45 -9
  362. package/tempo/internal/relay/feePayer.ts +6 -1
  363. package/utils/abi/getAbiItem.ts +49 -17
  364. package/utils/abi/parseEventLogs.ts +32 -11
  365. package/utils/authorization/serializeAuthorizationList.ts +7 -1
  366. package/utils/buildRequest.ts +29 -14
  367. package/utils/data/isHex.ts +18 -1
  368. package/utils/hash/normalizeSignature.ts +1 -1
  369. package/utils/hash/toSignature.ts +1 -1
  370. package/utils/hash/toSignatureHash.ts +1 -1
  371. package/utils/rpc/http.ts +33 -8
  372. package/utils/signature/compactSignatureToSignature.ts +4 -2
  373. package/utils/signature/hashTypedData.ts +1 -2
  374. package/utils/signature/signatureToCompactSignature.ts +13 -8
  375. package/utils/siwe/createSiweMessage.ts +1 -1
  376. package/utils/typedData.ts +11 -8
  377. package/utils/wait.ts +8 -4
@@ -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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"}
@@ -1,4 +1,5 @@
1
1
  import { BlockNotFoundError } from '../../errors/block.js';
2
+ import { MethodNotFoundRpcError, MethodNotSupportedRpcError, } from '../../errors/rpc.js';
2
3
  import { TransactionNotFoundError, TransactionReceiptNotFoundError, WaitForTransactionReceiptTimeoutError, } from '../../errors/transaction.js';
3
4
  import { isAddressEqual } from '../../utils/address/isAddressEqual.js';
4
5
  import { getAction } from '../../utils/getAction.js';
@@ -21,6 +22,9 @@ import { watchBlockNumber, } from './watchBlockNumber.js';
21
22
  * - Calls [`eth_getBlockByNumber`](https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_getblockbynumber) and extracts the transactions
22
23
  * - Checks if one of the Transactions is a replacement
23
24
  * - If so, calls [`eth_getTransactionReceipt`](https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_getTransactionReceipt).
25
+ * - If the Transaction is not found and `replacement` is provided:
26
+ * - Calls `eth_getTransactionBySenderAndNonce` to find the Transaction in its nonce slot
27
+ * - If it is a replacement, calls [`eth_getTransactionReceipt`](https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_getTransactionReceipt).
24
28
  *
25
29
  * The `waitForTransactionReceipt` action additionally supports Replacement detection (e.g. sped up Transactions).
26
30
  *
@@ -52,6 +56,11 @@ export async function waitForTransactionReceipt(client, parameters) {
52
56
  const { checkReplacement = client.chain?.supportsTransactionReplacementDetection ??
53
57
  true, confirmations = 1, hash, onReplaced, retryCount = 6, retryDelay = ({ count }) => ~~(1 << count) * 200, // exponential backoff
54
58
  timeout = 180_000, } = parameters;
59
+ // On chains with their own replacement keys, a sender and nonce do not
60
+ // identify a nonce slot.
61
+ const replacement = client.chain?.transactionReplacement?.getKey
62
+ ? undefined
63
+ : parameters.replacement;
55
64
  const getReplacementKey = (transaction) => client.chain?.transactionReplacement?.getKey?.(transaction) ??
56
65
  String(transaction.nonce);
57
66
  const pollingInterval = (() => {
@@ -72,13 +81,15 @@ export async function waitForTransactionReceipt(client, parameters) {
72
81
  checkReplacement,
73
82
  confirmations,
74
83
  pollingInterval,
84
+ replacement,
75
85
  retryCount,
76
86
  timeout,
77
87
  },
78
88
  ]);
79
89
  let transaction;
80
- let replacedTransaction;
81
90
  let receipt;
91
+ // A found replacement, kept while `receipt` waits for confirmations.
92
+ let replacementResponse;
82
93
  let retrying = false;
83
94
  let _unobserve;
84
95
  let _unwatch;
@@ -121,7 +132,11 @@ export async function waitForTransactionReceipt(client, parameters) {
121
132
  (!receipt.blockNumber ||
122
133
  blockNumber - receipt.blockNumber + 1n < confirmations))
123
134
  return;
124
- done(() => emit.resolve(receipt));
135
+ done(() => {
136
+ if (replacementResponse)
137
+ emit.onReplaced?.(replacementResponse);
138
+ emit.resolve(receipt);
139
+ });
125
140
  return;
126
141
  }
127
142
  // Get the transaction to check if it's been replaced.
@@ -136,6 +151,9 @@ export async function waitForTransactionReceipt(client, parameters) {
136
151
  }, {
137
152
  delay: retryDelay,
138
153
  retryCount,
154
+ // A dropped transaction does not reappear, so a known
155
+ // sender and nonce are looked up without the retries.
156
+ shouldRetry: ({ error }) => !(replacement && error instanceof TransactionNotFoundError),
139
157
  });
140
158
  retrying = false;
141
159
  }
@@ -153,20 +171,80 @@ export async function waitForTransactionReceipt(client, parameters) {
153
171
  // We need to check if it has potentially been replaced.
154
172
  if (err instanceof TransactionNotFoundError ||
155
173
  err instanceof TransactionReceiptNotFoundError) {
156
- if (!transaction) {
157
- retrying = false;
174
+ retrying = false;
175
+ // A node that dropped the transaction no longer returns it, so
176
+ // the known fields of it stand in. RPC hashes are lowercase.
177
+ const replaced = transaction ??
178
+ (checkReplacement && replacement
179
+ ? {
180
+ ...replacement,
181
+ hash: hash.toLowerCase(),
182
+ }
183
+ : undefined);
184
+ if (!replaced)
158
185
  return;
159
- }
160
186
  // The transaction was seen mined, so it consumed its nonce slot
161
187
  // and was not replaced: its receipt is not indexed yet. The
162
188
  // transaction is fetched once, so one first seen pending is
163
189
  // matched by replacement key instead.
164
- if (transaction.blockNumber) {
165
- retrying = false;
190
+ if (replaced.blockNumber)
166
191
  return;
167
- }
168
192
  try {
169
- replacedTransaction = transaction;
193
+ // Look up the transaction in the nonce slot, since the block
194
+ // scan below misses a replacement mined before the wait starts.
195
+ if (!transaction) {
196
+ retrying = true;
197
+ const found = (await getAction(client, getTransaction, 'getTransaction')({
198
+ nonce: replaced.nonce,
199
+ sender: replaced.from,
200
+ }).catch((error) => {
201
+ // Without the method, only the block scan runs from now
202
+ // on. Other errors retry the lookup on the next block.
203
+ if (error instanceof MethodNotFoundRpcError ||
204
+ error instanceof MethodNotSupportedRpcError)
205
+ transaction = replaced;
206
+ return undefined;
207
+ }));
208
+ retrying = false;
209
+ // The transaction still holds its nonce slot.
210
+ if (found?.hash.toLowerCase() ===
211
+ replaced.hash) {
212
+ transaction = found;
213
+ return;
214
+ }
215
+ // Another transaction holds the nonce slot, so it replaced
216
+ // this one. A pending replacement has no receipt yet.
217
+ if (found) {
218
+ const replacementReceipt = await getAction(client, getTransactionReceipt, 'getTransactionReceipt')({ hash: found.hash }).catch((error) => {
219
+ if (error instanceof TransactionReceiptNotFoundError)
220
+ return undefined;
221
+ throw error;
222
+ });
223
+ if (!replacementReceipt)
224
+ return;
225
+ receipt = replacementReceipt;
226
+ replacementResponse = {
227
+ reason: client.chain?.transactionReplacement?.getReason?.({
228
+ replaced,
229
+ replacement: found,
230
+ }) ??
231
+ getReplacementReason(replaced, found),
232
+ replacedTransaction: replaced,
233
+ transaction: found,
234
+ transactionReceipt: receipt,
235
+ };
236
+ // Check if we have enough confirmations. If not, continue polling.
237
+ if (confirmations > 1 &&
238
+ (!receipt.blockNumber ||
239
+ blockNumber - receipt.blockNumber + 1n < confirmations))
240
+ return;
241
+ done(() => {
242
+ emit.onReplaced?.(replacementResponse);
243
+ emit.resolve(receipt);
244
+ });
245
+ return;
246
+ }
247
+ }
170
248
  // Let's retrieve the transactions from the current block.
171
249
  // We need to retry as some RPC Providers may be slow to sync
172
250
  // up mined blocks.
@@ -180,9 +258,9 @@ export async function waitForTransactionReceipt(client, parameters) {
180
258
  shouldRetry: ({ error }) => error instanceof BlockNotFoundError,
181
259
  });
182
260
  retrying = false;
183
- const replacedKey = getReplacementKey(replacedTransaction);
184
- const replacementTransaction = block.transactions.find((candidate) => isAddressEqual(candidate.from, replacedTransaction.from) &&
185
- candidate.hash !== replacedTransaction.hash &&
261
+ const replacedKey = getReplacementKey(replaced);
262
+ const replacementTransaction = block.transactions.find((candidate) => isAddressEqual(candidate.from, replaced.from) &&
263
+ candidate.hash !== replaced.hash &&
186
264
  getReplacementKey(candidate) === replacedKey);
187
265
  // If we couldn't find a replacement transaction, continue polling.
188
266
  if (!replacementTransaction)
@@ -191,23 +269,23 @@ export async function waitForTransactionReceipt(client, parameters) {
191
269
  receipt = await getAction(client, getTransactionReceipt, 'getTransactionReceipt')({
192
270
  hash: replacementTransaction.hash,
193
271
  });
272
+ replacementResponse = {
273
+ reason: client.chain?.transactionReplacement?.getReason?.({
274
+ replaced,
275
+ replacement: replacementTransaction,
276
+ }) ??
277
+ getReplacementReason(replaced, replacementTransaction),
278
+ replacedTransaction: replaced,
279
+ transaction: replacementTransaction,
280
+ transactionReceipt: receipt,
281
+ };
194
282
  // Check if we have enough confirmations. If not, continue polling.
195
283
  if (confirmations > 1 &&
196
284
  (!receipt.blockNumber ||
197
285
  blockNumber - receipt.blockNumber + 1n < confirmations))
198
286
  return;
199
- const reason = client.chain?.transactionReplacement?.getReason?.({
200
- replaced: replacedTransaction,
201
- replacement: replacementTransaction,
202
- }) ??
203
- getReplacementReason(replacedTransaction, replacementTransaction);
204
287
  done(() => {
205
- emit.onReplaced?.({
206
- reason,
207
- replacedTransaction: replacedTransaction,
208
- transaction: replacementTransaction,
209
- transactionReceipt: receipt,
210
- });
288
+ emit.onReplaced?.(replacementResponse);
211
289
  emit.resolve(receipt);
212
290
  });
213
291
  }
@@ -1 +1 @@
1
- {"version":3,"file":"waitForTransactionReceipt.js","sourceRoot":"","sources":["../../../actions/public/waitForTransactionReceipt.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"waitForTransactionReceipt.js","sourceRoot":"","sources":["../../../actions/public/waitForTransactionReceipt.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAC1D,OAAO,EACL,sBAAsB,EACtB,0BAA0B,GAC3B,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EACL,wBAAwB,EACxB,+BAA+B,EAC/B,qCAAqC,GAEtC,MAAM,6BAA6B,CAAA;AAKpC,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,EAAyB,OAAO,EAAE,MAAM,wBAAwB,CAAA;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAA;AACpE,OAAO,EAEL,SAAS,GACV,MAAM,kCAAkC,CAAA;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAEpD,OAAO,EAA0B,QAAQ,EAAE,MAAM,eAAe,CAAA;AAChE,OAAO,EAGL,cAAc,GACf,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAGL,qBAAqB,GACtB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAEL,gBAAgB,GACjB,MAAM,uBAAuB,CAAA;AA4F9B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAG7C,MAAgC,EAChC,UAAsD;IAEtD,MAAM,EACJ,gBAAgB,GAAG,MAAM,CAAC,KAAK,EAAE,uCAAuC;QACtE,IAAI,EACN,aAAa,GAAG,CAAC,EACjB,IAAI,EACJ,UAAU,EACV,UAAU,GAAG,CAAC,EACd,UAAU,GAAG,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,GAAG,EAAE,sBAAsB;IACxE,OAAO,GAAG,OAAO,GAClB,GAAG,UAAU,CAAA;IAEd,uEAAuE;IACvE,yBAAyB;IACzB,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,EAAE,sBAAsB,EAAE,MAAM;QAC9D,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,UAAU,CAAC,WAAW,CAAA;IAE1B,MAAM,iBAAiB,GAAG,CAAC,WAAwB,EAAE,EAAE,CACrD,MAAM,CAAC,KAAK,EAAE,sBAAsB,EAAE,MAAM,EAAE,CAAC,WAAW,CAAC;QAC3D,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;IAE3B,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE;QAC5B,IAAI,UAAU,CAAC,eAAe;YAAE,OAAO,UAAU,CAAC,eAAe,CAAA;QACjE,IAAI,MAAM,CAAC,KAAK,EAAE,gCAAgC;YAChD,OAAO,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAA;QACtD,OAAO,MAAM,CAAC,eAAe,CAAA;IAC/B,CAAC,CAAC,EAAE,CAAA;IAEJ,MAAM,UAAU,GAAG,SAAS,CAAC;QAC3B,2BAA2B;QAC3B,MAAM,CAAC,GAAG;QACV,IAAI;QACJ,qEAAqE;QACrE,uEAAuE;QACvE,uEAAuE;QACvE;YACE,gBAAgB;YAChB,aAAa;YACb,eAAe;YACf,WAAW;YACX,UAAU;YACV,OAAO;SACR;KACF,CAAC,CAAA;IAEF,IAAI,WAAwD,CAAA;IAC5D,IAAI,OAA2D,CAAA;IAC/D,qEAAqE;IACrE,IAAI,mBAA6D,CAAA;IACjE,IAAI,QAAQ,GAAG,KAAK,CAAA;IAEpB,IAAI,UAAsB,CAAA;IAC1B,IAAI,QAAoB,CAAA;IAExB,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAChC,aAAa,EAA8C,CAAA;IAE7D,MAAM,KAAK,GAAG,OAAO;QACnB,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE;YACd,QAAQ,EAAE,EAAE,CAAA;YACZ,UAAU,EAAE,EAAE,CAAA;YACd,MAAM,CAAC,IAAI,qCAAqC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;QAC7D,CAAC,EAAE,OAAO,CAAC;QACb,CAAC,CAAC,SAAS,CAAA;IAEb,UAAU,GAAG,OAAO,CAClB,UAAU,EACV,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,EAC/B,KAAK,EAAE,IAAI,EAAE,EAAE;QACb,OAAO,GAAG,MAAM,SAAS,CACvB,MAAM,EACN,qBAAqB,EACrB,uBAAuB,CACxB,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;QAElC,IAAI,OAAO,IAAI,aAAa,IAAI,CAAC,EAAE,CAAC;YAClC,YAAY,CAAC,KAAK,CAAC,CAAA;YACnB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;YACrB,UAAU,EAAE,EAAE,CAAA;YACd,OAAM;QACR,CAAC;QAED,QAAQ,GAAG,SAAS,CAClB,MAAM,EACN,gBAAgB,EAChB,kBAAkB,CACnB,CAAC;YACA,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE,IAAI;YACjB,IAAI,EAAE,IAAI;YACV,eAAe;YACf,KAAK,CAAC,aAAa,CAAC,YAAY;gBAC9B,MAAM,IAAI,GAAG,CAAC,EAAc,EAAE,EAAE;oBAC9B,YAAY,CAAC,KAAK,CAAC,CAAA;oBACnB,QAAQ,EAAE,EAAE,CAAA;oBACZ,EAAE,EAAE,CAAA;oBACJ,UAAU,EAAE,EAAE,CAAA;gBAChB,CAAC,CAAA;gBAED,IAAI,WAAW,GAAG,YAAY,CAAA;gBAE9B,IAAI,QAAQ;oBAAE,OAAM;gBAEpB,IAAI,CAAC;oBACH,oEAAoE;oBACpE,gDAAgD;oBAChD,IAAI,OAAO,EAAE,CAAC;wBACZ,IACE,aAAa,GAAG,CAAC;4BACjB,CAAC,CAAC,OAAO,CAAC,WAAW;gCACnB,WAAW,GAAG,OAAO,CAAC,WAAW,GAAG,EAAE,GAAG,aAAa,CAAC;4BAEzD,OAAM;wBAER,IAAI,CAAC,GAAG,EAAE;4BACR,IAAI,mBAAmB;gCAAE,IAAI,CAAC,UAAU,EAAE,CAAC,mBAAmB,CAAC,CAAA;4BAC/D,IAAI,CAAC,OAAO,CAAC,OAAQ,CAAC,CAAA;wBACxB,CAAC,CAAC,CAAA;wBACF,OAAM;oBACR,CAAC;oBAED,sDAAsD;oBACtD,6DAA6D;oBAC7D,yBAAyB;oBACzB,IAAI,gBAAgB,IAAI,CAAC,WAAW,EAAE,CAAC;wBACrC,QAAQ,GAAG,IAAI,CAAA;wBACf,MAAM,SAAS,CACb,KAAK,IAAI,EAAE;4BACT,WAAW,GAAG,CAAC,MAAM,SAAS,CAC5B,MAAM,EACN,cAAc,EACd,gBAAgB,CACjB,CAAC,EAAE,IAAI,EAAE,CAAC,CAAoC,CAAA;4BAC/C,IAAI,WAAW,CAAC,WAAW;gCACzB,WAAW,GAAG,WAAW,CAAC,WAAW,CAAA;wBACzC,CAAC,EACD;4BACE,KAAK,EAAE,UAAU;4BACjB,UAAU;4BACV,sDAAsD;4BACtD,sDAAsD;4BACtD,WAAW,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CACzB,CAAC,CAAC,WAAW,IAAI,KAAK,YAAY,wBAAwB,CAAC;yBAC9D,CACF,CAAA;wBACD,QAAQ,GAAG,KAAK,CAAA;oBAClB,CAAC;oBAED,mDAAmD;oBACnD,OAAO,GAAG,MAAM,SAAS,CACvB,MAAM,EACN,qBAAqB,EACrB,uBAAuB,CACxB,CAAC,EAAE,IAAI,EAAE,CAAC,CAAA;oBAEX,mEAAmE;oBACnE,IACE,aAAa,GAAG,CAAC;wBACjB,CAAC,CAAC,OAAO,CAAC,WAAW;4BACnB,WAAW,GAAG,OAAO,CAAC,WAAW,GAAG,EAAE,GAAG,aAAa,CAAC;wBAEzD,OAAM;oBAER,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,OAAQ,CAAC,CAAC,CAAA;gBACpC,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,gEAAgE;oBAChE,wDAAwD;oBACxD,IACE,GAAG,YAAY,wBAAwB;wBACvC,GAAG,YAAY,+BAA+B,EAC9C,CAAC;wBACD,QAAQ,GAAG,KAAK,CAAA;wBAEhB,+DAA+D;wBAC/D,6DAA6D;wBAC7D,MAAM,QAAQ,GACZ,WAAW;4BACX,CAAC,gBAAgB,IAAI,WAAW;gCAC9B,CAAC,CAAE;oCACC,GAAG,WAAW;oCACd,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE;iCACW;gCACvC,CAAC,CAAC,SAAS,CAAC,CAAA;wBAChB,IAAI,CAAC,QAAQ;4BAAE,OAAM;wBAErB,gEAAgE;wBAChE,4DAA4D;wBAC5D,4DAA4D;wBAC5D,sCAAsC;wBACtC,IAAI,QAAQ,CAAC,WAAW;4BAAE,OAAM;wBAEhC,IAAI,CAAC;4BACH,6DAA6D;4BAC7D,gEAAgE;4BAChE,IAAI,CAAC,WAAW,EAAE,CAAC;gCACjB,QAAQ,GAAG,IAAI,CAAA;gCACf,MAAM,KAAK,GAAG,CAAC,MAAM,SAAS,CAC5B,MAAM,EACN,cAAc,EACd,gBAAgB,CACjB,CAAC;oCACA,KAAK,EAAE,QAAQ,CAAC,KAAK;oCACrB,MAAM,EAAE,QAAQ,CAAC,IAAI;iCACtB,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;oCACjB,wDAAwD;oCACxD,uDAAuD;oCACvD,IACE,KAAK,YAAY,sBAAsB;wCACvC,KAAK,YAAY,0BAA0B;wCAE3C,WAAW,GAAG,QAAQ,CAAA;oCACxB,OAAO,SAAS,CAAA;gCAClB,CAAC,CAAC,CAAgD,CAAA;gCAClD,QAAQ,GAAG,KAAK,CAAA;gCAEhB,8CAA8C;gCAC9C,IACG,KAAiC,EAAE,IAAI,CAAC,WAAW,EAAE;oCACtD,QAAQ,CAAC,IAAI,EACb,CAAC;oCACD,WAAW,GAAG,KAAK,CAAA;oCACnB,OAAM;gCACR,CAAC;gCAED,2DAA2D;gCAC3D,sDAAsD;gCACtD,IAAI,KAAK,EAAE,CAAC;oCACV,MAAM,kBAAkB,GAAG,MAAM,SAAS,CACxC,MAAM,EACN,qBAAqB,EACrB,uBAAuB,CACxB,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;wCACtC,IAAI,KAAK,YAAY,+BAA+B;4CAClD,OAAO,SAAS,CAAA;wCAClB,MAAM,KAAK,CAAA;oCACb,CAAC,CAAC,CAAA;oCACF,IAAI,CAAC,kBAAkB;wCAAE,OAAM;oCAE/B,OAAO,GAAG,kBAAkB,CAAA;oCAC5B,mBAAmB,GAAG;wCACpB,MAAM,EACJ,MAAM,CAAC,KAAK,EAAE,sBAAsB,EAAE,SAAS,EAAE,CAAC;4CAChD,QAAQ;4CACR,WAAW,EAAE,KAAK;yCACnB,CAAC;4CACF,oBAAoB,CAClB,QAAuB,EACvB,KAAoB,CACrB;wCACH,mBAAmB,EAAE,QAAuB;wCAC5C,WAAW,EAAE,KAAoB;wCACjC,kBAAkB,EAAE,OAAO;qCAC5B,CAAA;oCAED,mEAAmE;oCACnE,IACE,aAAa,GAAG,CAAC;wCACjB,CAAC,CAAC,OAAO,CAAC,WAAW;4CACnB,WAAW,GAAG,OAAO,CAAC,WAAW,GAAG,EAAE,GAAG,aAAa,CAAC;wCAEzD,OAAM;oCAER,IAAI,CAAC,GAAG,EAAE;wCACR,IAAI,CAAC,UAAU,EAAE,CAAC,mBAAoB,CAAC,CAAA;wCACvC,IAAI,CAAC,OAAO,CAAC,OAAQ,CAAC,CAAA;oCACxB,CAAC,CAAC,CAAA;oCACF,OAAM;gCACR,CAAC;4BACH,CAAC;4BAED,0DAA0D;4BAC1D,6DAA6D;4BAC7D,mBAAmB;4BACnB,QAAQ,GAAG,IAAI,CAAA;4BACf,MAAM,KAAK,GAAG,MAAM,SAAS,CAC3B,GAAG,EAAE,CACH,SAAS,CACP,MAAM,EACN,QAAQ,EACR,UAAU,CACX,CAAC;gCACA,WAAW;gCACX,mBAAmB,EAAE,IAAI;6BAC1B,CAAC,EACJ;gCACE,KAAK,EAAE,UAAU;gCACjB,UAAU;gCACV,WAAW,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CACzB,KAAK,YAAY,kBAAkB;6BACtC,CACF,CAAA;4BACD,QAAQ,GAAG,KAAK,CAAA;4BAEhB,MAAM,WAAW,GAAG,iBAAiB,CAAC,QAAuB,CAAC,CAAA;4BAC9D,MAAM,sBAAsB,GAC1B,KAAK,CAAC,YACP,CAAC,IAAI,CACJ,CAAC,SAAS,EAAE,EAAE,CACZ,cAAc,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC;gCAC7C,SAAS,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI;gCAChC,iBAAiB,CAAC,SAAS,CAAC,KAAK,WAAW,CAC/C,CAAA;4BAED,mEAAmE;4BACnE,IAAI,CAAC,sBAAsB;gCAAE,OAAM;4BAEnC,8DAA8D;4BAC9D,OAAO,GAAG,MAAM,SAAS,CACvB,MAAM,EACN,qBAAqB,EACrB,uBAAuB,CACxB,CAAC;gCACA,IAAI,EAAE,sBAAsB,CAAC,IAAI;6BAClC,CAAC,CAAA;4BACF,mBAAmB,GAAG;gCACpB,MAAM,EACJ,MAAM,CAAC,KAAK,EAAE,sBAAsB,EAAE,SAAS,EAAE,CAAC;oCAChD,QAAQ;oCACR,WAAW,EAAE,sBAAsB;iCACpC,CAAC;oCACF,oBAAoB,CAClB,QAAuB,EACvB,sBAAsB,CACvB;gCACH,mBAAmB,EAAE,QAAuB;gCAC5C,WAAW,EAAE,sBAAsB;gCACnC,kBAAkB,EAAE,OAAO;6BAC5B,CAAA;4BAED,mEAAmE;4BACnE,IACE,aAAa,GAAG,CAAC;gCACjB,CAAC,CAAC,OAAO,CAAC,WAAW;oCACnB,WAAW,GAAG,OAAO,CAAC,WAAW,GAAG,EAAE,GAAG,aAAa,CAAC;gCAEzD,OAAM;4BAER,IAAI,CAAC,GAAG,EAAE;gCACR,IAAI,CAAC,UAAU,EAAE,CAAC,mBAAoB,CAAC,CAAA;gCACvC,IAAI,CAAC,OAAO,CAAC,OAAQ,CAAC,CAAA;4BACxB,CAAC,CAAC,CAAA;wBACJ,CAAC;wBAAC,OAAO,IAAI,EAAE,CAAC;4BACd,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;wBAC/B,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAA;oBAC9B,CAAC;gBACH,CAAC;YACH,CAAC;SACF,CAAC,CAAA;IACJ,CAAC,CACF,CAAA;IAED,sEAAsE;IACtE,uEAAuE;IACvE,yEAAyE;IACzE,2EAA2E;IAC3E,wEAAwE;IACxE,2EAA2E;IAC3E,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE;QAC1B,YAAY,CAAC,KAAK,CAAC,CAAA;QACnB,UAAU,EAAE,EAAE,CAAA;IAChB,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,oBAAoB,CAC3B,QAAqB,EACrB,WAAwB;IAExB,IACE,CAAC,WAAW,CAAC,EAAE,IAAI,QAAQ,CAAC,EAAE;QAC5B,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC7C,CAAC,CAAC,WAAW,CAAC,EAAE,KAAK,QAAQ,CAAC,EAAE,CAAC;QACnC,WAAW,CAAC,KAAK,KAAK,QAAQ,CAAC,KAAK;QACpC,WAAW,CAAC,KAAK,KAAK,QAAQ,CAAC,KAAK;QAEpC,OAAO,UAAU,CAAA;IACnB,IAAI,WAAW,CAAC,IAAI,KAAK,WAAW,CAAC,EAAE,IAAI,WAAW,CAAC,KAAK,KAAK,EAAE;QACjE,OAAO,WAAW,CAAA;IACpB,OAAO,UAAU,CAAA;AACnB,CAAC"}
@@ -1,4 +1,6 @@
1
1
  import { DecodeLogDataMismatch, DecodeLogTopicsMismatch, } from '../../errors/abi.js';
2
+ import { BaseError } from '../../errors/base.js';
3
+ import { HttpRequestError, RpcRequestError } from '../../errors/request.js';
2
4
  import { InvalidInputRpcError } from '../../errors/rpc.js';
3
5
  import { decodeEventLog } from '../../utils/abi/decodeEventLog.js';
4
6
  import { encodeEventTopics, } from '../../utils/abi/encodeEventTopics.js';
@@ -19,7 +21,7 @@ import { uninstallFilter } from './uninstallFilter.js';
19
21
  *
20
22
  * This Action will batch up all the event logs found within the [`pollingInterval`](https://viem.sh/docs/contract/watchContractEvent#pollinginterval-optional), and invoke them via [`onLogs`](https://viem.sh/docs/contract/watchContractEvent#onLogs).
21
23
  *
22
- * `watchContractEvent` will attempt to create an [Event Filter](https://viem.sh/docs/contract/createContractEventFilter) and listen to changes to the Filter per polling interval, however, if the RPC Provider does not support Filters (e.g. `eth_newFilter`), then `watchContractEvent` will fall back to using [`getLogs`](https://viem.sh/docs/actions/public/getLogs) instead.
24
+ * `watchContractEvent` will attempt to create an [Event Filter](https://viem.sh/docs/contract/createContractEventFilter) and listen to changes to the Filter per polling interval, however, if the RPC Provider does not support Filters (e.g. `eth_newFilter`), then `watchContractEvent` will fall back to using [`getLogs`](https://viem.sh/docs/actions/public/getLogs) instead. If `getLogs` fails for a block range, `watchContractEvent` will retry with smaller block ranges and may call `onLogs` more than once per polling interval.
23
25
  *
24
26
  * @param client - Client to use
25
27
  * @param parameters - {@link WatchContractEventParameters}
@@ -72,11 +74,29 @@ export function watchContractEvent(client, parameters) {
72
74
  fromBlock,
73
75
  ]);
74
76
  return observe(observerId, { onLogs, onError }, (emit) => {
75
- let previousBlockNumber;
76
- if (fromBlock !== undefined)
77
- previousBlockNumber = fromBlock - 1n;
77
+ let active = true;
78
+ let previousBlockNumber = fromBlock === undefined ? undefined : fromBlock - 1n;
78
79
  let filter;
79
80
  let initialized = false;
81
+ const emitLogs = (logs) => {
82
+ if (logs.length === 0)
83
+ return;
84
+ if (batch)
85
+ emit.onLogs(logs);
86
+ else
87
+ for (const log of logs)
88
+ emit.onLogs([log]);
89
+ };
90
+ // Fetches the logs of the blocks from `from` to `to`, inclusive.
91
+ const getLogsInRange = (from, to) => getAction(client, getContractEvents, 'getContractEvents')({
92
+ abi,
93
+ address,
94
+ args,
95
+ eventName,
96
+ fromBlock: from,
97
+ toBlock: to,
98
+ strict,
99
+ });
80
100
  const unwatch = poll(async () => {
81
101
  if (!initialized) {
82
102
  try {
@@ -91,44 +111,44 @@ export function watchContractEvent(client, parameters) {
91
111
  }
92
112
  catch { }
93
113
  initialized = true;
94
- return;
114
+ if (filter)
115
+ return;
95
116
  }
96
117
  try {
97
- let logs;
98
118
  if (filter) {
99
- logs = await getAction(client, getFilterChanges, 'getFilterChanges')({ filter });
119
+ const logs = await getAction(client, getFilterChanges, 'getFilterChanges')({ filter });
120
+ emitLogs(logs);
121
+ return;
100
122
  }
101
- else {
102
- // If the filter doesn't exist, we will fall back to use `getLogs`.
103
- // The fall back exists because some RPC Providers do not support filters.
104
- // Fetch the block number to use for `getLogs`.
105
- const blockNumber = await getAction(client, getBlockNumber, 'getBlockNumber')({});
106
- // If the block number has changed, we will need to fetch the logs.
107
- // If the block number doesn't exist, we are yet to reach the first poll interval,
108
- // so do not emit any logs.
109
- if (previousBlockNumber && previousBlockNumber < blockNumber) {
110
- logs = await getAction(client, getContractEvents, 'getContractEvents')({
111
- abi,
112
- address,
113
- args,
114
- eventName,
115
- fromBlock: previousBlockNumber + 1n,
116
- toBlock: blockNumber,
117
- strict,
118
- });
123
+ // If the filter doesn't exist, we will fall back to use `getLogs`.
124
+ // The fall back exists because some RPC Providers do not support filters.
125
+ const blockNumber = await getAction(client, getBlockNumber, 'getBlockNumber')({});
126
+ // Without `fromBlock`, start watching from the current block.
127
+ previousBlockNumber ??= blockNumber;
128
+ // RPC Providers limit `eth_getLogs` by block range, log count or response
129
+ // size. `size` is the most blocks to request at once: it starts with all
130
+ // new blocks and halves whenever a request fails.
131
+ let size = blockNumber - previousBlockNumber;
132
+ while (previousBlockNumber < blockNumber) {
133
+ const from = previousBlockNumber + 1n;
134
+ const end = previousBlockNumber + size;
135
+ const to = end < blockNumber ? end : blockNumber;
136
+ const logs = await getLogsInRange(from, to).catch((error) => {
137
+ // A single block cannot be split, and a smaller range does not
138
+ // help when the RPC Provider is unreachable or rejects the client.
139
+ if (from === to || !isRangeError(error))
140
+ throw error;
141
+ });
142
+ if (!active)
143
+ return;
144
+ if (!logs) {
145
+ size = (to - from + 1n) / 2n;
146
+ continue;
119
147
  }
120
- else {
121
- logs = [];
122
- }
123
- previousBlockNumber = blockNumber;
148
+ // Only move past blocks whose logs were fetched, so none are skipped.
149
+ previousBlockNumber = to;
150
+ emitLogs(logs);
124
151
  }
125
- if (logs.length === 0)
126
- return;
127
- if (batch)
128
- emit.onLogs(logs);
129
- else
130
- for (const log of logs)
131
- emit.onLogs([log]);
132
152
  }
133
153
  catch (err) {
134
154
  // If a filter has been set and gets uninstalled, providers will throw an InvalidInput error.
@@ -142,6 +162,7 @@ export function watchContractEvent(client, parameters) {
142
162
  interval: pollingInterval,
143
163
  });
144
164
  return async () => {
165
+ active = false;
145
166
  if (filter)
146
167
  await getAction(client, uninstallFilter, 'uninstallFilter')({ filter });
147
168
  unwatch();
@@ -238,4 +259,20 @@ export function watchContractEvent(client, parameters) {
238
259
  };
239
260
  return enablePolling ? pollContractEvent() : subscribeContractEvent();
240
261
  }
262
+ /** Returns whether a failed `eth_getLogs` request may succeed with a smaller block range. */
263
+ function isRangeError(error) {
264
+ if (!(error instanceof BaseError))
265
+ return true;
266
+ const cause = error.walk((err) => err instanceof HttpRequestError || err instanceof RpcRequestError);
267
+ if (!cause)
268
+ return true;
269
+ // Rate limited.
270
+ if (cause instanceof RpcRequestError && cause.code === 429)
271
+ return false;
272
+ // Unreachable.
273
+ if (cause instanceof HttpRequestError && cause.status === undefined)
274
+ return false;
275
+ // Unauthorized, forbidden or rate limited.
276
+ return cause.status !== 401 && cause.status !== 403 && cause.status !== 429;
277
+ }
241
278
  //# sourceMappingURL=watchContractEvent.js.map
@@ -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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"}
@@ -1,4 +1,6 @@
1
1
  import { DecodeLogDataMismatch, DecodeLogTopicsMismatch, } from '../../errors/abi.js';
2
+ import { BaseError } from '../../errors/base.js';
3
+ import { HttpRequestError, RpcRequestError } from '../../errors/request.js';
2
4
  import { InvalidInputRpcError } from '../../errors/rpc.js';
3
5
  import { decodeEventLog } from '../../utils/abi/decodeEventLog.js';
4
6
  import { encodeEventTopics, } from '../../utils/abi/encodeEventTopics.js';
@@ -25,7 +27,7 @@ import { uninstallFilter } from './uninstallFilter.js';
25
27
  *
26
28
  * This Action will batch up all the Event Logs found within the [`pollingInterval`](https://viem.sh/docs/actions/public/watchEvent#pollinginterval-optional), and invoke them via [`onLogs`](https://viem.sh/docs/actions/public/watchEvent#onLogs).
27
29
  *
28
- * `watchEvent` will attempt to create an [Event Filter](https://viem.sh/docs/actions/public/createEventFilter) and listen to changes to the Filter per polling interval, however, if the RPC Provider does not support Filters (e.g. `eth_newFilter`), then `watchEvent` will fall back to using [`getLogs`](https://viem.sh/docs/actions/public/getLogs) instead.
30
+ * `watchEvent` will attempt to create an [Event Filter](https://viem.sh/docs/actions/public/createEventFilter) and listen to changes to the Filter per polling interval, however, if the RPC Provider does not support Filters (e.g. `eth_newFilter`), then `watchEvent` will fall back to using [`getLogs`](https://viem.sh/docs/actions/public/getLogs) instead. If `getLogs` fails for a block range, `watchEvent` will retry with smaller block ranges and may call `onLogs` more than once per polling interval.
29
31
  *
30
32
  * @param client - Client to use
31
33
  * @param parameters - {@link WatchEventParameters}
@@ -74,11 +76,29 @@ export function watchEvent(client, { address, args, batch = true, event, events,
74
76
  fromBlock,
75
77
  ]);
76
78
  return observe(observerId, { onLogs, onError }, (emit) => {
77
- let previousBlockNumber;
78
- if (fromBlock !== undefined)
79
- previousBlockNumber = fromBlock - 1n;
79
+ let active = true;
80
+ let previousBlockNumber = fromBlock === undefined ? undefined : fromBlock - 1n;
80
81
  let filter;
81
82
  let initialized = false;
83
+ const emitLogs = (logs) => {
84
+ if (logs.length === 0)
85
+ return;
86
+ if (batch)
87
+ emit.onLogs(logs);
88
+ else
89
+ for (const log of logs)
90
+ emit.onLogs([log]);
91
+ };
92
+ // Fetches the logs of the blocks from `from` to `to`, inclusive.
93
+ const getLogsInRange = (from, to) => getAction(client, getLogs, 'getLogs')({
94
+ address,
95
+ args,
96
+ event: event,
97
+ events,
98
+ fromBlock: from,
99
+ strict,
100
+ toBlock: to,
101
+ });
82
102
  const unwatch = poll(async () => {
83
103
  if (!initialized) {
84
104
  try {
@@ -93,43 +113,44 @@ export function watchEvent(client, { address, args, batch = true, event, events,
93
113
  }
94
114
  catch { }
95
115
  initialized = true;
96
- return;
116
+ if (filter)
117
+ return;
97
118
  }
98
119
  try {
99
- let logs;
100
120
  if (filter) {
101
- logs = await getAction(client, getFilterChanges, 'getFilterChanges')({ filter });
121
+ const logs = await getAction(client, getFilterChanges, 'getFilterChanges')({ filter });
122
+ emitLogs(logs);
123
+ return;
102
124
  }
103
- else {
104
- // If the filter doesn't exist, we will fall back to use `getLogs`.
105
- // The fall back exists because some RPC Providers do not support filters.
106
- // Fetch the block number to use for `getLogs`.
107
- const blockNumber = await getAction(client, getBlockNumber, 'getBlockNumber')({});
108
- // If the block number has changed, we will need to fetch the logs.
109
- // If the block number doesn't exist, we are yet to reach the first poll interval,
110
- // so do not emit any logs.
111
- if (previousBlockNumber && previousBlockNumber !== blockNumber) {
112
- logs = await getAction(client, getLogs, 'getLogs')({
113
- address,
114
- args,
115
- event: event,
116
- events,
117
- fromBlock: previousBlockNumber + 1n,
118
- toBlock: blockNumber,
119
- });
120
- }
121
- else {
122
- logs = [];
125
+ // If the filter doesn't exist, we will fall back to use `getLogs`.
126
+ // The fall back exists because some RPC Providers do not support filters.
127
+ const blockNumber = await getAction(client, getBlockNumber, 'getBlockNumber')({});
128
+ // Without `fromBlock`, start watching from the current block.
129
+ previousBlockNumber ??= blockNumber;
130
+ // RPC Providers limit `eth_getLogs` by block range, log count or response
131
+ // size. `size` is the most blocks to request at once: it starts with all
132
+ // new blocks and halves whenever a request fails.
133
+ let size = blockNumber - previousBlockNumber;
134
+ while (previousBlockNumber < blockNumber) {
135
+ const from = previousBlockNumber + 1n;
136
+ const end = previousBlockNumber + size;
137
+ const to = end < blockNumber ? end : blockNumber;
138
+ const logs = await getLogsInRange(from, to).catch((error) => {
139
+ // A single block cannot be split, and a smaller range does not
140
+ // help when the RPC Provider is unreachable or rejects the client.
141
+ if (from === to || !isRangeError(error))
142
+ throw error;
143
+ });
144
+ if (!active)
145
+ return;
146
+ if (!logs) {
147
+ size = (to - from + 1n) / 2n;
148
+ continue;
123
149
  }
124
- previousBlockNumber = blockNumber;
150
+ // Only move past blocks whose logs were fetched, so none are skipped.
151
+ previousBlockNumber = to;
152
+ emitLogs(logs);
125
153
  }
126
- if (logs.length === 0)
127
- return;
128
- if (batch)
129
- emit.onLogs(logs);
130
- else
131
- for (const log of logs)
132
- emit.onLogs([log]);
133
154
  }
134
155
  catch (err) {
135
156
  // If a filter has been set and gets uninstalled, providers will throw an InvalidInput error.
@@ -143,6 +164,7 @@ export function watchEvent(client, { address, args, batch = true, event, events,
143
164
  interval: pollingInterval,
144
165
  });
145
166
  return async () => {
167
+ active = false;
146
168
  if (filter)
147
169
  await getAction(client, uninstallFilter, 'uninstallFilter')({ filter });
148
170
  unwatch();
@@ -228,4 +250,20 @@ export function watchEvent(client, { address, args, batch = true, event, events,
228
250
  };
229
251
  return enablePolling ? pollEvent() : subscribeEvent();
230
252
  }
253
+ /** Returns whether a failed `eth_getLogs` request may succeed with a smaller block range. */
254
+ function isRangeError(error) {
255
+ if (!(error instanceof BaseError))
256
+ return true;
257
+ const cause = error.walk((err) => err instanceof HttpRequestError || err instanceof RpcRequestError);
258
+ if (!cause)
259
+ return true;
260
+ // Rate limited.
261
+ if (cause instanceof RpcRequestError && cause.code === 429)
262
+ return false;
263
+ // Unreachable.
264
+ if (cause instanceof HttpRequestError && cause.status === undefined)
265
+ return false;
266
+ // Unauthorized, forbidden or rate limited.
267
+ return cause.status !== 401 && cause.status !== 403 && cause.status !== 429;
268
+ }
231
269
  //# sourceMappingURL=watchEvent.js.map