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
package/CHANGELOG.md CHANGED
@@ -1,5 +1,67 @@
1
1
  # viem
2
2
 
3
+ ## 2.57.13
4
+
5
+ ### Patch Changes
6
+
7
+ - [#5310](https://github.com/wevm/viem/pull/5310) [`7e015cb1d72e6b54e4468d7dd60aa59a51fe8d9b`](https://github.com/wevm/viem/commit/7e015cb1d72e6b54e4468d7dd60aa59a51fe8d9b) Thanks [@BaronOdon](https://github.com/BaronOdon)! - Added Molibra chain.
8
+
9
+ - [#5314](https://github.com/wevm/viem/pull/5314) [`c0d52cdcb262744a64e742e4cf891cbbde9ccdc9`](https://github.com/wevm/viem/commit/c0d52cdcb262744a64e742e4cf891cbbde9ccdc9) Thanks [@jxom](https://github.com/jxom)! - `viem/tempo`: Keyed `Relay.accounts` stored configs by chain ID so `account_getConfig` no longer serves a config stored for another chain (configs stored under the previous key are no longer read), added a `resolveConfig` option that resolves and stores configs the store does not hold, and reduced round trips by reading the commitment without a prior block number request and writing each config once.
10
+
11
+ - [#5332](https://github.com/wevm/viem/pull/5332) [`de39e106022f313a16c3b7367d8330753748c516`](https://github.com/wevm/viem/commit/de39e106022f313a16c3b7367d8330753748c516) Thanks [@jxom](https://github.com/jxom)! - `viem/tempo`: Added `signMessage` and `signTypedData` support to `Account.fromConfig` configurable accounts, which sign the EIP-191 or EIP-712 digest with the same configurable signature envelope as `sign`.
12
+
13
+ - [#5325](https://github.com/wevm/viem/pull/5325) [`2220ab8f52cf7fcf5420502d30272175b49065ca`](https://github.com/wevm/viem/commit/2220ab8f52cf7fcf5420502d30272175b49065ca) Thanks [@Slokh](https://github.com/Slokh)! - `viem/tempo`: Fixed formatting of Tempo transactions whose nonce exceeds `Number.MAX_SAFE_INTEGER` (such as TIP-1106 expiring-nonce discriminators), which made `getTransaction`, `getBlock` with `includeTransactions` and `waitForTransactionReceipt` replacement checks throw `IntegerOutOfRangeError`. Formatted Tempo transactions now carry `nonce` as an exact `bigint`, matching ox.
14
+
15
+ - [#5337](https://github.com/wevm/viem/pull/5337) [`609f2bf5a127774904cbc9d97f0e9be7b45c3a7d`](https://github.com/wevm/viem/commit/609f2bf5a127774904cbc9d97f0e9be7b45c3a7d) Thanks [@jxom](https://github.com/jxom)! - `viem/tempo`: Fixed `Relay.feePayer` not reporting base-fee floor rejections when the Tempo node returns `fee cap less than base fee`.
16
+
17
+ - [#5336](https://github.com/wevm/viem/pull/5336) [`35e551ed4189d28749f0d12e67177a10e574f4f0`](https://github.com/wevm/viem/commit/35e551ed4189d28749f0d12e67177a10e574f4f0) Thanks [@jxom](https://github.com/jxom)! - `viem/tempo`: Fixed `fillTransaction` returning a `number` `nonce` on Tempo transactions when a `nonce` was passed and no fee payer signed the filled transaction.
18
+
19
+ - [#5330](https://github.com/wevm/viem/pull/5330) [`1f9c2f00e6b18b194aa510ee09f4ae684af2e976`](https://github.com/wevm/viem/commit/1f9c2f00e6b18b194aa510ee09f4ae684af2e976) Thanks [@jxom](https://github.com/jxom)! - Fixed `watchEvent` and `watchContractEvent` in the `eth_getLogs` fallback stalling for good when the blocks since the last poll exceeded the RPC Provider's block range, log count, or response size limit, repeating logs when an RPC node reported a lower block number, emitting logs from before a `fromBlock` past the latest block, ignoring `fromBlock: 1n`, and missing logs from the first polling interval without `fromBlock`.
20
+
21
+ ## 2.57.12
22
+
23
+ ### Patch Changes
24
+
25
+ - [#5281](https://github.com/wevm/viem/pull/5281) [`744f749bcd56fa0bc93efd0fcdc05125e0252c21`](https://github.com/wevm/viem/commit/744f749bcd56fa0bc93efd0fcdc05125e0252c21) Thanks [@jxom](https://github.com/jxom)! - Fixed `getAbiItem` overload resolution for arrays with a `0` in the element size (e.g. `uint160[]`) or the wrong fixed length, tuple objects with reordered keys, and ambiguous `address[]` overloads.
26
+
27
+ - [#5304](https://github.com/wevm/viem/pull/5304) [`918955e81ef333af521e3e3e1b3fe03cb5231bdf`](https://github.com/wevm/viem/commit/918955e81ef333af521e3e3e1b3fe03cb5231bdf) Thanks [@jxom](https://github.com/jxom)! - Fixed `serializeAuthorizationList` and `serializeTransaction` to encode an EIP-7702 authorization `yParity` above 1 as is instead of normalizing it to 1, which changed the transaction hash.
28
+
29
+ - [#5279](https://github.com/wevm/viem/pull/5279) [`10ef1295f73362ea4f3c36b6655fef1cb04b397e`](https://github.com/wevm/viem/commit/10ef1295f73362ea4f3c36b6655fef1cb04b397e) Thanks [@jxom](https://github.com/jxom)! - Fixed `signatureToCompactSignature` and `compactSignatureToSignature` for values shorter than 32 bytes and a legacy `v` with a chain id, and added errors for invalid `v` and high `s`.
30
+
31
+ - [#5298](https://github.com/wevm/viem/pull/5298) [`a69e96c8e89cc0398a6b918c392e24e3b615bee0`](https://github.com/wevm/viem/commit/a69e96c8e89cc0398a6b918c392e24e3b615bee0) Thanks [@jxom](https://github.com/jxom)! - Fixed `getTimeToFinalize` and `waitToFinalize` to also wait for the proof's dispute game to resolve and pass its finality delay, instead of only the proof maturity delay.
32
+
33
+ - [#5282](https://github.com/wevm/viem/pull/5282) [`52140fef00389781737477de205f82f71553b3c3`](https://github.com/wevm/viem/commit/52140fef00389781737477de205f82f71553b3c3) Thanks [@jxom](https://github.com/jxom)! - Fixed `http` transport batches and `getHttpRpcClient` array requests mishandling a server that rejected the whole batch with a single error or returned fewer responses than requests.
34
+
35
+ - [#5286](https://github.com/wevm/viem/pull/5286) [`8e058ca71bf09c85d2a4669af5e98aeb5bc87e71`](https://github.com/wevm/viem/commit/8e058ca71bf09c85d2a4669af5e98aeb5bc87e71) Thanks [@jxom](https://github.com/jxom)! - Fixed the `http` transport to retry JSON-RPC errors from non-2xx responses by their HTTP status and `Retry-After` header, and exposed `status` and `headers` on `RpcRequestError`.
36
+
37
+ - [#5300](https://github.com/wevm/viem/pull/5300) [`485a9d922ffe00a3d2bc4bbfc6ef0262a85e9f45`](https://github.com/wevm/viem/commit/485a9d922ffe00a3d2bc4bbfc6ef0262a85e9f45) Thanks [@jxom](https://github.com/jxom)! - Fixed `toFunctionSelector` and `toSignatureHash` keeping the `error` keyword in string signatures like `error Foo(uint256)`, which produced the wrong selector.
38
+
39
+ - [#5283](https://github.com/wevm/viem/pull/5283) [`b2b7a3b82fd52ad74f80075d5a25cd99750f754a`](https://github.com/wevm/viem/commit/b2b7a3b82fd52ad74f80075d5a25cd99750f754a) Thanks [@jxom](https://github.com/jxom)! - Added an `even` option to `isHex` that rejects hex values with an odd number of hex characters.
40
+
41
+ - [#5303](https://github.com/wevm/viem/pull/5303) [`d10dc3c203c63ec42abc2cd392fb7de4562cb591`](https://github.com/wevm/viem/commit/d10dc3c203c63ec42abc2cd392fb7de4562cb591) Thanks [@jxom](https://github.com/jxom)! - Fixed `InsufficientFundsError` not being raised for reth's `EVM error: OutOfFunds` node message.
42
+
43
+ - [#5280](https://github.com/wevm/viem/pull/5280) [`e7e0122fab41b6c43d1d03ffe395044d1445bcc0`](https://github.com/wevm/viem/commit/e7e0122fab41b6c43d1d03ffe395044d1445bcc0) Thanks [@jxom](https://github.com/jxom)! - Fixed `parseEventLogs` `args` filters dropping logs whose `string` or `bytes` values were decoded from data or differed in hex case, and matching every partially decoded log.
44
+
45
+ - [#5284](https://github.com/wevm/viem/pull/5284) [`b3e39473523d7be57ec5f35f51cb416f16b6cbd2`](https://github.com/wevm/viem/commit/b3e39473523d7be57ec5f35f51cb416f16b6cbd2) Thanks [@jxom](https://github.com/jxom)! - Added a `replacement` parameter to `waitForTransactionReceipt` that detects a replacement of a Transaction the node dropped before the wait first read it, and fixed `onReplaced` not being called for a replacement when `confirmations` is greater than 1.
46
+
47
+ - [#5288](https://github.com/wevm/viem/pull/5288) [`75ffe81d29d85bee3b895a5d7ae612675b625ee8`](https://github.com/wevm/viem/commit/75ffe81d29d85bee3b895a5d7ae612675b625ee8) Thanks [@jxom](https://github.com/jxom)! - Fixed request retries firing immediately for `Retry-After` headers in HTTP-date form or for delays longer than the 24.8-day timer limit.
48
+
49
+ - [#5301](https://github.com/wevm/viem/pull/5301) [`efda1c43147b85fdde5a9d5b88c4ffd5a9262073`](https://github.com/wevm/viem/commit/efda1c43147b85fdde5a9d5b88c4ffd5a9262073) Thanks [@jxom](https://github.com/jxom)! - Fixed `sendCalls` dropping a call's `dataSuffix` when the call has no `data`.
50
+
51
+ - [#5306](https://github.com/wevm/viem/pull/5306) [`30833eca2ef352e2af34f577964b633823acc999`](https://github.com/wevm/viem/commit/30833eca2ef352e2af34f577964b633823acc999) Thanks [@jxom](https://github.com/jxom)! - Fixed importing `viem`, `viem/actions`, `viem/chains`, and other entrypoints under SES `lockdown()`, which threw `Cannot assign to read only property 'call'`.
52
+
53
+ - [#5299](https://github.com/wevm/viem/pull/5299) [`6c2278d129eb21b2928999fd2f5b28c233132f7d`](https://github.com/wevm/viem/commit/6c2278d129eb21b2928999fd2f5b28c233132f7d) Thanks [@jxom](https://github.com/jxom)! - Fixed `createSiweMessage` rejecting domains with a punycode (internationalized) top-level domain, such as `example.xn--p1ai`, and accepting top-level domain labels longer than 63 characters.
54
+
55
+ - [#5302](https://github.com/wevm/viem/pull/5302) [`c42c189ee8fe1b0183b6abf1b00a58f134ea2b57`](https://github.com/wevm/viem/commit/c42c189ee8fe1b0183b6abf1b00a58f134ea2b57) Thanks [@jxom](https://github.com/jxom)! - Fixed `getWithdrawalStatus`, `getTimeToProve` and `waitToProve` matching super-root dispute games against the withdrawal's L2 block number when `l2Timestamp` was not passed: they now use the `blockTimestamp` of the receipt's logs, or throw `L2TimestampRequiredError` when it is missing.
56
+
57
+ - [#5311](https://github.com/wevm/viem/pull/5311) [`e3247c5513912695313dba030111e7f6a1e1aacd`](https://github.com/wevm/viem/commit/e3247c5513912695313dba030111e7f6a1e1aacd) Thanks [@jxom](https://github.com/jxom)! - `viem/tempo`: Derived configurable account addresses from the initial config hash instead of a recovery factory (tempoxyz/tempo#8595), so `Account.fromConfig` no longer takes a `factory` option and `Addresses.configurableAccountRecoveryFactory` was removed.
58
+
59
+ - [#5308](https://github.com/wevm/viem/pull/5308) [`71636a342b859fa9f15296d2f15377430db4629e`](https://github.com/wevm/viem/commit/71636a342b859fa9f15296d2f15377430db4629e) Thanks [@jxom](https://github.com/jxom)! - Fixed `validateTypedData` and `hashTypedData` to accept struct names that start with a Solidity type name (such as `intent`), to reject struct names that shadow a Solidity type (such as `uint256[]` or `uint7`), and to include struct names that contain `$` in the encoded type.
60
+
61
+ - [#5271](https://github.com/wevm/viem/pull/5271) [`2867b2a88458044af6aa84fc5494539eab05e143`](https://github.com/wevm/viem/commit/2867b2a88458044af6aa84fc5494539eab05e143) Thanks [@loveyuanfandj-glitch](https://github.com/loveyuanfandj-glitch)! - Added ValueChain mainnet and testnet chains.
62
+
63
+ - [#5309](https://github.com/wevm/viem/pull/5309) [`5068c9ffc5cdb8b7240aa18158db6c62ad455944`](https://github.com/wevm/viem/commit/5068c9ffc5cdb8b7240aa18158db6c62ad455944) Thanks [@mmv08](https://github.com/mmv08)! - Fixed `watchEvent` to pass `strict` to its `getLogs` fallback, so a `strict: true` watcher on an RPC Provider without filters no longer gets logs that do not match the event.
64
+
3
65
  ## 2.57.11
4
66
 
5
67
  ### Patch Changes
@@ -71,7 +71,7 @@ async function fillTransaction(client, parameters) {
71
71
  transaction.feePayerSignature !== null;
72
72
  if (hasFeePayerSignature &&
73
73
  typeof nonce !== 'undefined' &&
74
- transaction.nonce !== nonce)
74
+ BigInt(transaction.nonce) !== BigInt(nonce))
75
75
  throw new transaction_js_1.FeePayerNonceMismatchError({
76
76
  filledNonce: transaction.nonce,
77
77
  requestedNonce: nonce,
@@ -90,8 +90,11 @@ async function fillTransaction(client, parameters) {
90
90
  if (transaction.maxPriorityFeePerGas)
91
91
  transaction.maxPriorityFeePerGas =
92
92
  parameters.maxPriorityFeePerGas ?? transaction.maxPriorityFeePerGas;
93
- if (typeof transaction.nonce !== 'undefined')
94
- transaction.nonce = parameters.nonce ?? transaction.nonce;
93
+ if (typeof transaction.nonce !== 'undefined' &&
94
+ typeof parameters.nonce !== 'undefined')
95
+ transaction.nonce = (typeof transaction.nonce === 'bigint'
96
+ ? BigInt(parameters.nonce)
97
+ : parameters.nonce);
95
98
  const feeMultiplier = await (async () => {
96
99
  if (typeof chain?.fees?.baseFeeMultiplier === 'function') {
97
100
  const block = await (0, getAction_js_1.getAction)(client, getBlock_js_1.getBlock, 'getBlock')({});
@@ -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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"}
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.waitForTransactionReceipt = waitForTransactionReceipt;
4
4
  const block_js_1 = require("../../errors/block.js");
5
+ const rpc_js_1 = require("../../errors/rpc.js");
5
6
  const transaction_js_1 = require("../../errors/transaction.js");
6
7
  const isAddressEqual_js_1 = require("../../utils/address/isAddressEqual.js");
7
8
  const getAction_js_1 = require("../../utils/getAction.js");
@@ -16,6 +17,9 @@ const watchBlockNumber_js_1 = require("./watchBlockNumber.js");
16
17
  async function waitForTransactionReceipt(client, parameters) {
17
18
  const { checkReplacement = client.chain?.supportsTransactionReplacementDetection ??
18
19
  true, confirmations = 1, hash, onReplaced, retryCount = 6, retryDelay = ({ count }) => ~~(1 << count) * 200, timeout = 180_000, } = parameters;
20
+ const replacement = client.chain?.transactionReplacement?.getKey
21
+ ? undefined
22
+ : parameters.replacement;
19
23
  const getReplacementKey = (transaction) => client.chain?.transactionReplacement?.getKey?.(transaction) ??
20
24
  String(transaction.nonce);
21
25
  const pollingInterval = (() => {
@@ -33,13 +37,14 @@ async function waitForTransactionReceipt(client, parameters) {
33
37
  checkReplacement,
34
38
  confirmations,
35
39
  pollingInterval,
40
+ replacement,
36
41
  retryCount,
37
42
  timeout,
38
43
  },
39
44
  ]);
40
45
  let transaction;
41
- let replacedTransaction;
42
46
  let receipt;
47
+ let replacementResponse;
43
48
  let retrying = false;
44
49
  let _unobserve;
45
50
  let _unwatch;
@@ -80,7 +85,11 @@ async function waitForTransactionReceipt(client, parameters) {
80
85
  (!receipt.blockNumber ||
81
86
  blockNumber - receipt.blockNumber + 1n < confirmations))
82
87
  return;
83
- done(() => emit.resolve(receipt));
88
+ done(() => {
89
+ if (replacementResponse)
90
+ emit.onReplaced?.(replacementResponse);
91
+ emit.resolve(receipt);
92
+ });
84
93
  return;
85
94
  }
86
95
  if (checkReplacement && !transaction) {
@@ -92,6 +101,7 @@ async function waitForTransactionReceipt(client, parameters) {
92
101
  }, {
93
102
  delay: retryDelay,
94
103
  retryCount,
104
+ shouldRetry: ({ error }) => !(replacement && error instanceof transaction_js_1.TransactionNotFoundError),
95
105
  });
96
106
  retrying = false;
97
107
  }
@@ -105,16 +115,66 @@ async function waitForTransactionReceipt(client, parameters) {
105
115
  catch (err) {
106
116
  if (err instanceof transaction_js_1.TransactionNotFoundError ||
107
117
  err instanceof transaction_js_1.TransactionReceiptNotFoundError) {
108
- if (!transaction) {
109
- retrying = false;
118
+ retrying = false;
119
+ const replaced = transaction ??
120
+ (checkReplacement && replacement
121
+ ? {
122
+ ...replacement,
123
+ hash: hash.toLowerCase(),
124
+ }
125
+ : undefined);
126
+ if (!replaced)
110
127
  return;
111
- }
112
- if (transaction.blockNumber) {
113
- retrying = false;
128
+ if (replaced.blockNumber)
114
129
  return;
115
- }
116
130
  try {
117
- replacedTransaction = transaction;
131
+ if (!transaction) {
132
+ retrying = true;
133
+ const found = (await (0, getAction_js_1.getAction)(client, getTransaction_js_1.getTransaction, 'getTransaction')({
134
+ nonce: replaced.nonce,
135
+ sender: replaced.from,
136
+ }).catch((error) => {
137
+ if (error instanceof rpc_js_1.MethodNotFoundRpcError ||
138
+ error instanceof rpc_js_1.MethodNotSupportedRpcError)
139
+ transaction = replaced;
140
+ return undefined;
141
+ }));
142
+ retrying = false;
143
+ if (found?.hash.toLowerCase() ===
144
+ replaced.hash) {
145
+ transaction = found;
146
+ return;
147
+ }
148
+ if (found) {
149
+ const replacementReceipt = await (0, getAction_js_1.getAction)(client, getTransactionReceipt_js_1.getTransactionReceipt, 'getTransactionReceipt')({ hash: found.hash }).catch((error) => {
150
+ if (error instanceof transaction_js_1.TransactionReceiptNotFoundError)
151
+ return undefined;
152
+ throw error;
153
+ });
154
+ if (!replacementReceipt)
155
+ return;
156
+ receipt = replacementReceipt;
157
+ replacementResponse = {
158
+ reason: client.chain?.transactionReplacement?.getReason?.({
159
+ replaced,
160
+ replacement: found,
161
+ }) ??
162
+ getReplacementReason(replaced, found),
163
+ replacedTransaction: replaced,
164
+ transaction: found,
165
+ transactionReceipt: receipt,
166
+ };
167
+ if (confirmations > 1 &&
168
+ (!receipt.blockNumber ||
169
+ blockNumber - receipt.blockNumber + 1n < confirmations))
170
+ return;
171
+ done(() => {
172
+ emit.onReplaced?.(replacementResponse);
173
+ emit.resolve(receipt);
174
+ });
175
+ return;
176
+ }
177
+ }
118
178
  retrying = true;
119
179
  const block = await (0, withRetry_js_1.withRetry)(() => (0, getAction_js_1.getAction)(client, getBlock_js_1.getBlock, 'getBlock')({
120
180
  blockNumber,
@@ -125,31 +185,31 @@ async function waitForTransactionReceipt(client, parameters) {
125
185
  shouldRetry: ({ error }) => error instanceof block_js_1.BlockNotFoundError,
126
186
  });
127
187
  retrying = false;
128
- const replacedKey = getReplacementKey(replacedTransaction);
129
- const replacementTransaction = block.transactions.find((candidate) => (0, isAddressEqual_js_1.isAddressEqual)(candidate.from, replacedTransaction.from) &&
130
- candidate.hash !== replacedTransaction.hash &&
188
+ const replacedKey = getReplacementKey(replaced);
189
+ const replacementTransaction = block.transactions.find((candidate) => (0, isAddressEqual_js_1.isAddressEqual)(candidate.from, replaced.from) &&
190
+ candidate.hash !== replaced.hash &&
131
191
  getReplacementKey(candidate) === replacedKey);
132
192
  if (!replacementTransaction)
133
193
  return;
134
194
  receipt = await (0, getAction_js_1.getAction)(client, getTransactionReceipt_js_1.getTransactionReceipt, 'getTransactionReceipt')({
135
195
  hash: replacementTransaction.hash,
136
196
  });
197
+ replacementResponse = {
198
+ reason: client.chain?.transactionReplacement?.getReason?.({
199
+ replaced,
200
+ replacement: replacementTransaction,
201
+ }) ??
202
+ getReplacementReason(replaced, replacementTransaction),
203
+ replacedTransaction: replaced,
204
+ transaction: replacementTransaction,
205
+ transactionReceipt: receipt,
206
+ };
137
207
  if (confirmations > 1 &&
138
208
  (!receipt.blockNumber ||
139
209
  blockNumber - receipt.blockNumber + 1n < confirmations))
140
210
  return;
141
- const reason = client.chain?.transactionReplacement?.getReason?.({
142
- replaced: replacedTransaction,
143
- replacement: replacementTransaction,
144
- }) ??
145
- getReplacementReason(replacedTransaction, replacementTransaction);
146
211
  done(() => {
147
- emit.onReplaced?.({
148
- reason,
149
- replacedTransaction: replacedTransaction,
150
- transaction: replacementTransaction,
151
- transactionReceipt: receipt,
152
- });
212
+ emit.onReplaced?.(replacementResponse);
153
213
  emit.resolve(receipt);
154
214
  });
155
215
  }
@@ -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":"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"}
@@ -2,6 +2,8 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.watchContractEvent = watchContractEvent;
4
4
  const abi_js_1 = require("../../errors/abi.js");
5
+ const base_js_1 = require("../../errors/base.js");
6
+ const request_js_1 = require("../../errors/request.js");
5
7
  const rpc_js_1 = require("../../errors/rpc.js");
6
8
  const decodeEventLog_js_1 = require("../../utils/abi/decodeEventLog.js");
7
9
  const encodeEventTopics_js_1 = require("../../utils/abi/encodeEventTopics.js");
@@ -45,11 +47,28 @@ function watchContractEvent(client, parameters) {
45
47
  fromBlock,
46
48
  ]);
47
49
  return (0, observe_js_1.observe)(observerId, { onLogs, onError }, (emit) => {
48
- let previousBlockNumber;
49
- if (fromBlock !== undefined)
50
- previousBlockNumber = fromBlock - 1n;
50
+ let active = true;
51
+ let previousBlockNumber = fromBlock === undefined ? undefined : fromBlock - 1n;
51
52
  let filter;
52
53
  let initialized = false;
54
+ const emitLogs = (logs) => {
55
+ if (logs.length === 0)
56
+ return;
57
+ if (batch)
58
+ emit.onLogs(logs);
59
+ else
60
+ for (const log of logs)
61
+ emit.onLogs([log]);
62
+ };
63
+ const getLogsInRange = (from, to) => (0, getAction_js_1.getAction)(client, getContractEvents_js_1.getContractEvents, 'getContractEvents')({
64
+ abi,
65
+ address,
66
+ args,
67
+ eventName,
68
+ fromBlock: from,
69
+ toBlock: to,
70
+ strict,
71
+ });
53
72
  const unwatch = (0, poll_js_1.poll)(async () => {
54
73
  if (!initialized) {
55
74
  try {
@@ -64,38 +83,35 @@ function watchContractEvent(client, parameters) {
64
83
  }
65
84
  catch { }
66
85
  initialized = true;
67
- return;
86
+ if (filter)
87
+ return;
68
88
  }
69
89
  try {
70
- let logs;
71
90
  if (filter) {
72
- logs = await (0, getAction_js_1.getAction)(client, getFilterChanges_js_1.getFilterChanges, 'getFilterChanges')({ filter });
91
+ const logs = await (0, getAction_js_1.getAction)(client, getFilterChanges_js_1.getFilterChanges, 'getFilterChanges')({ filter });
92
+ emitLogs(logs);
93
+ return;
73
94
  }
74
- else {
75
- const blockNumber = await (0, getAction_js_1.getAction)(client, getBlockNumber_js_1.getBlockNumber, 'getBlockNumber')({});
76
- if (previousBlockNumber && previousBlockNumber < blockNumber) {
77
- logs = await (0, getAction_js_1.getAction)(client, getContractEvents_js_1.getContractEvents, 'getContractEvents')({
78
- abi,
79
- address,
80
- args,
81
- eventName,
82
- fromBlock: previousBlockNumber + 1n,
83
- toBlock: blockNumber,
84
- strict,
85
- });
95
+ const blockNumber = await (0, getAction_js_1.getAction)(client, getBlockNumber_js_1.getBlockNumber, 'getBlockNumber')({});
96
+ previousBlockNumber ??= blockNumber;
97
+ let size = blockNumber - previousBlockNumber;
98
+ while (previousBlockNumber < blockNumber) {
99
+ const from = previousBlockNumber + 1n;
100
+ const end = previousBlockNumber + size;
101
+ const to = end < blockNumber ? end : blockNumber;
102
+ const logs = await getLogsInRange(from, to).catch((error) => {
103
+ if (from === to || !isRangeError(error))
104
+ throw error;
105
+ });
106
+ if (!active)
107
+ return;
108
+ if (!logs) {
109
+ size = (to - from + 1n) / 2n;
110
+ continue;
86
111
  }
87
- else {
88
- logs = [];
89
- }
90
- previousBlockNumber = blockNumber;
112
+ previousBlockNumber = to;
113
+ emitLogs(logs);
91
114
  }
92
- if (logs.length === 0)
93
- return;
94
- if (batch)
95
- emit.onLogs(logs);
96
- else
97
- for (const log of logs)
98
- emit.onLogs([log]);
99
115
  }
100
116
  catch (err) {
101
117
  if (filter && err instanceof rpc_js_1.InvalidInputRpcError)
@@ -107,6 +123,7 @@ function watchContractEvent(client, parameters) {
107
123
  interval: pollingInterval,
108
124
  });
109
125
  return async () => {
126
+ active = false;
110
127
  if (filter)
111
128
  await (0, getAction_js_1.getAction)(client, uninstallFilter_js_1.uninstallFilter, 'uninstallFilter')({ filter });
112
129
  unwatch();
@@ -201,4 +218,16 @@ function watchContractEvent(client, parameters) {
201
218
  };
202
219
  return enablePolling ? pollContractEvent() : subscribeContractEvent();
203
220
  }
221
+ function isRangeError(error) {
222
+ if (!(error instanceof base_js_1.BaseError))
223
+ return true;
224
+ const cause = error.walk((err) => err instanceof request_js_1.HttpRequestError || err instanceof request_js_1.RpcRequestError);
225
+ if (!cause)
226
+ return true;
227
+ if (cause instanceof request_js_1.RpcRequestError && cause.code === 429)
228
+ return false;
229
+ if (cause instanceof request_js_1.HttpRequestError && cause.status === undefined)
230
+ return false;
231
+ return cause.status !== 401 && cause.status !== 403 && cause.status !== 429;
232
+ }
204
233
  //# 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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"}
@@ -2,6 +2,8 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.watchEvent = watchEvent;
4
4
  const abi_js_1 = require("../../errors/abi.js");
5
+ const base_js_1 = require("../../errors/base.js");
6
+ const request_js_1 = require("../../errors/request.js");
5
7
  const rpc_js_1 = require("../../errors/rpc.js");
6
8
  const decodeEventLog_js_1 = require("../../utils/abi/decodeEventLog.js");
7
9
  const encodeEventTopics_js_1 = require("../../utils/abi/encodeEventTopics.js");
@@ -45,11 +47,28 @@ function watchEvent(client, { address, args, batch = true, event, events, fromBl
45
47
  fromBlock,
46
48
  ]);
47
49
  return (0, observe_js_1.observe)(observerId, { onLogs, onError }, (emit) => {
48
- let previousBlockNumber;
49
- if (fromBlock !== undefined)
50
- previousBlockNumber = fromBlock - 1n;
50
+ let active = true;
51
+ let previousBlockNumber = fromBlock === undefined ? undefined : fromBlock - 1n;
51
52
  let filter;
52
53
  let initialized = false;
54
+ const emitLogs = (logs) => {
55
+ if (logs.length === 0)
56
+ return;
57
+ if (batch)
58
+ emit.onLogs(logs);
59
+ else
60
+ for (const log of logs)
61
+ emit.onLogs([log]);
62
+ };
63
+ const getLogsInRange = (from, to) => (0, getAction_js_1.getAction)(client, getLogs_js_1.getLogs, 'getLogs')({
64
+ address,
65
+ args,
66
+ event: event,
67
+ events,
68
+ fromBlock: from,
69
+ strict,
70
+ toBlock: to,
71
+ });
53
72
  const unwatch = (0, poll_js_1.poll)(async () => {
54
73
  if (!initialized) {
55
74
  try {
@@ -64,37 +83,35 @@ function watchEvent(client, { address, args, batch = true, event, events, fromBl
64
83
  }
65
84
  catch { }
66
85
  initialized = true;
67
- return;
86
+ if (filter)
87
+ return;
68
88
  }
69
89
  try {
70
- let logs;
71
90
  if (filter) {
72
- logs = await (0, getAction_js_1.getAction)(client, getFilterChanges_js_1.getFilterChanges, 'getFilterChanges')({ filter });
91
+ const logs = await (0, getAction_js_1.getAction)(client, getFilterChanges_js_1.getFilterChanges, 'getFilterChanges')({ filter });
92
+ emitLogs(logs);
93
+ return;
73
94
  }
74
- else {
75
- const blockNumber = await (0, getAction_js_1.getAction)(client, getBlockNumber_js_1.getBlockNumber, 'getBlockNumber')({});
76
- if (previousBlockNumber && previousBlockNumber !== blockNumber) {
77
- logs = await (0, getAction_js_1.getAction)(client, getLogs_js_1.getLogs, 'getLogs')({
78
- address,
79
- args,
80
- event: event,
81
- events,
82
- fromBlock: previousBlockNumber + 1n,
83
- toBlock: blockNumber,
84
- });
85
- }
86
- else {
87
- logs = [];
95
+ const blockNumber = await (0, getAction_js_1.getAction)(client, getBlockNumber_js_1.getBlockNumber, 'getBlockNumber')({});
96
+ previousBlockNumber ??= blockNumber;
97
+ let size = blockNumber - previousBlockNumber;
98
+ while (previousBlockNumber < blockNumber) {
99
+ const from = previousBlockNumber + 1n;
100
+ const end = previousBlockNumber + size;
101
+ const to = end < blockNumber ? end : blockNumber;
102
+ const logs = await getLogsInRange(from, to).catch((error) => {
103
+ if (from === to || !isRangeError(error))
104
+ throw error;
105
+ });
106
+ if (!active)
107
+ return;
108
+ if (!logs) {
109
+ size = (to - from + 1n) / 2n;
110
+ continue;
88
111
  }
89
- previousBlockNumber = blockNumber;
112
+ previousBlockNumber = to;
113
+ emitLogs(logs);
90
114
  }
91
- if (logs.length === 0)
92
- return;
93
- if (batch)
94
- emit.onLogs(logs);
95
- else
96
- for (const log of logs)
97
- emit.onLogs([log]);
98
115
  }
99
116
  catch (err) {
100
117
  if (filter && err instanceof rpc_js_1.InvalidInputRpcError)
@@ -106,6 +123,7 @@ function watchEvent(client, { address, args, batch = true, event, events, fromBl
106
123
  interval: pollingInterval,
107
124
  });
108
125
  return async () => {
126
+ active = false;
109
127
  if (filter)
110
128
  await (0, getAction_js_1.getAction)(client, uninstallFilter_js_1.uninstallFilter, 'uninstallFilter')({ filter });
111
129
  unwatch();
@@ -188,4 +206,16 @@ function watchEvent(client, { address, args, batch = true, event, events, fromBl
188
206
  };
189
207
  return enablePolling ? pollEvent() : subscribeEvent();
190
208
  }
209
+ function isRangeError(error) {
210
+ if (!(error instanceof base_js_1.BaseError))
211
+ return true;
212
+ const cause = error.walk((err) => err instanceof request_js_1.HttpRequestError || err instanceof request_js_1.RpcRequestError);
213
+ if (!cause)
214
+ return true;
215
+ if (cause instanceof request_js_1.RpcRequestError && cause.code === 429)
216
+ return false;
217
+ if (cause instanceof request_js_1.HttpRequestError && cause.status === undefined)
218
+ return false;
219
+ return cause.status !== 401 && cause.status !== 403 && cause.status !== 429;
220
+ }
191
221
  //# sourceMappingURL=watchEvent.js.map