viem 2.57.14 → 2.57.16

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 (363) hide show
  1. package/CHANGELOG.md +58 -0
  2. package/_cjs/account-abstraction/utils/formatters/userOperationReceipt.js +2 -0
  3. package/_cjs/account-abstraction/utils/formatters/userOperationReceipt.js.map +1 -1
  4. package/_cjs/actions/public/estimateGas.js +5 -2
  5. package/_cjs/actions/public/estimateGas.js.map +1 -1
  6. package/_cjs/actions/public/fillTransaction.js +2 -0
  7. package/_cjs/actions/public/fillTransaction.js.map +1 -1
  8. package/_cjs/actions/public/getFilterChanges.js +1 -0
  9. package/_cjs/actions/public/getFilterChanges.js.map +1 -1
  10. package/_cjs/actions/public/getFilterLogs.js +1 -0
  11. package/_cjs/actions/public/getFilterLogs.js.map +1 -1
  12. package/_cjs/actions/public/watchBlockNumber.js +3 -1
  13. package/_cjs/actions/public/watchBlockNumber.js.map +1 -1
  14. package/_cjs/actions/public/watchBlocks.js +20 -8
  15. package/_cjs/actions/public/watchBlocks.js.map +1 -1
  16. package/_cjs/actions/public/watchContractEvent.js +10 -3
  17. package/_cjs/actions/public/watchContractEvent.js.map +1 -1
  18. package/_cjs/actions/public/watchEvent.js +5 -0
  19. package/_cjs/actions/public/watchEvent.js.map +1 -1
  20. package/_cjs/actions/wallet/prepareTransactionRequest.js +3 -2
  21. package/_cjs/actions/wallet/prepareTransactionRequest.js.map +1 -1
  22. package/_cjs/actions/wallet/sendTransaction.js +4 -2
  23. package/_cjs/actions/wallet/sendTransaction.js.map +1 -1
  24. package/_cjs/actions/wallet/sendTransactionSync.js +48 -7
  25. package/_cjs/actions/wallet/sendTransactionSync.js.map +1 -1
  26. package/_cjs/chains/definitions/hashKeyChain.js +4 -4
  27. package/_cjs/chains/definitions/hashKeyChain.js.map +1 -1
  28. package/_cjs/chains/definitions/hashkeyChainTestnet.js +4 -4
  29. package/_cjs/chains/definitions/hashkeyChainTestnet.js.map +1 -1
  30. package/_cjs/chains/definitions/turkchain.js +26 -0
  31. package/_cjs/chains/definitions/turkchain.js.map +1 -0
  32. package/_cjs/chains/definitions/zksync.js +1 -1
  33. package/_cjs/chains/definitions/zksync.js.map +1 -1
  34. package/_cjs/chains/index.js +4 -2
  35. package/_cjs/chains/index.js.map +1 -1
  36. package/_cjs/clients/createClient.js.map +1 -1
  37. package/_cjs/clients/transports/fallback.js +5 -0
  38. package/_cjs/clients/transports/fallback.js.map +1 -1
  39. package/_cjs/errors/node.js +10 -4
  40. package/_cjs/errors/node.js.map +1 -1
  41. package/_cjs/errors/typedData.js +4 -2
  42. package/_cjs/errors/typedData.js.map +1 -1
  43. package/_cjs/errors/version.js +1 -1
  44. package/_cjs/index.js +5 -4
  45. package/_cjs/index.js.map +1 -1
  46. package/_cjs/tempo/Account.js +85 -12
  47. package/_cjs/tempo/Account.js.map +1 -1
  48. package/_cjs/tempo/Gateway.js +195 -0
  49. package/_cjs/tempo/Gateway.js.map +1 -0
  50. package/_cjs/tempo/GatewayDecorator.js +168 -0
  51. package/_cjs/tempo/GatewayDecorator.js.map +1 -0
  52. package/_cjs/tempo/Transaction.js +2 -1
  53. package/_cjs/tempo/Transaction.js.map +1 -1
  54. package/_cjs/tempo/actions/ai.js +69 -0
  55. package/_cjs/tempo/actions/ai.js.map +1 -0
  56. package/_cjs/tempo/actions/bucket.js +85 -0
  57. package/_cjs/tempo/actions/bucket.js.map +1 -0
  58. package/_cjs/tempo/actions/compute.js +165 -0
  59. package/_cjs/tempo/actions/compute.js.map +1 -0
  60. package/_cjs/tempo/actions/gateway.js +8 -0
  61. package/_cjs/tempo/actions/gateway.js.map +1 -0
  62. package/_cjs/tempo/actions/index.js +6 -1
  63. package/_cjs/tempo/actions/index.js.map +1 -1
  64. package/_cjs/tempo/actions/kv.js +44 -0
  65. package/_cjs/tempo/actions/kv.js.map +1 -0
  66. package/_cjs/tempo/chainConfig.js +4 -12
  67. package/_cjs/tempo/chainConfig.js.map +1 -1
  68. package/_cjs/tempo/index.js +4 -1
  69. package/_cjs/tempo/index.js.map +1 -1
  70. package/_cjs/tempo/internal/ndjson.js +43 -0
  71. package/_cjs/tempo/internal/ndjson.js.map +1 -0
  72. package/_cjs/tempo/internal/relay/feePayer.js +18 -5
  73. package/_cjs/tempo/internal/relay/feePayer.js.map +1 -1
  74. package/_cjs/utils/abi/decodeEventLog.js +57 -7
  75. package/_cjs/utils/abi/decodeEventLog.js.map +1 -1
  76. package/_cjs/utils/abi/getAbiItem.js +27 -6
  77. package/_cjs/utils/abi/getAbiItem.js.map +1 -1
  78. package/_cjs/utils/abi/parseEventLogs.js +27 -4
  79. package/_cjs/utils/abi/parseEventLogs.js.map +1 -1
  80. package/_cjs/utils/authorization/recoverAuthorizationAddress.js +9 -2
  81. package/_cjs/utils/authorization/recoverAuthorizationAddress.js.map +1 -1
  82. package/_cjs/utils/authorization/verifyAuthorization.js +14 -4
  83. package/_cjs/utils/authorization/verifyAuthorization.js.map +1 -1
  84. package/_cjs/utils/buildRequest.js +4 -0
  85. package/_cjs/utils/buildRequest.js.map +1 -1
  86. package/_cjs/utils/ccip.js +134 -28
  87. package/_cjs/utils/ccip.js.map +1 -1
  88. package/_cjs/utils/ccipTunnel.js +5 -1
  89. package/_cjs/utils/ccipTunnel.js.map +1 -1
  90. package/_cjs/utils/ens/localBatchGatewayRequest.js +55 -5
  91. package/_cjs/utils/ens/localBatchGatewayRequest.js.map +1 -1
  92. package/_cjs/utils/hash/toSignatureHash.js +10 -1
  93. package/_cjs/utils/hash/toSignatureHash.js.map +1 -1
  94. package/_cjs/utils/internal/http.js +79 -0
  95. package/_cjs/utils/internal/http.js.map +1 -0
  96. package/_cjs/utils/nonceManager.js.map +1 -1
  97. package/_cjs/utils/rpc/http.js +9 -76
  98. package/_cjs/utils/rpc/http.js.map +1 -1
  99. package/_cjs/utils/rpc/socket.js +20 -9
  100. package/_cjs/utils/rpc/socket.js.map +1 -1
  101. package/_cjs/utils/transaction/assertRequest.js +2 -2
  102. package/_cjs/utils/transaction/assertRequest.js.map +1 -1
  103. package/_cjs/utils/transaction/assertTransaction.js +2 -2
  104. package/_cjs/utils/transaction/assertTransaction.js.map +1 -1
  105. package/_cjs/utils/transaction/parseTransaction.js +21 -7
  106. package/_cjs/utils/transaction/parseTransaction.js.map +1 -1
  107. package/_cjs/utils/typedData.js +19 -6
  108. package/_cjs/utils/typedData.js.map +1 -1
  109. package/_cjs/zksync/actions/finalizeWithdrawal.js +4 -2
  110. package/_cjs/zksync/actions/finalizeWithdrawal.js.map +1 -1
  111. package/_cjs/zksync/actions/isWithdrawalFinalized.js +4 -5
  112. package/_cjs/zksync/actions/isWithdrawalFinalized.js.map +1 -1
  113. package/_esm/account-abstraction/utils/formatters/userOperationReceipt.js +2 -0
  114. package/_esm/account-abstraction/utils/formatters/userOperationReceipt.js.map +1 -1
  115. package/_esm/actions/public/estimateGas.js +10 -5
  116. package/_esm/actions/public/estimateGas.js.map +1 -1
  117. package/_esm/actions/public/fillTransaction.js +2 -0
  118. package/_esm/actions/public/fillTransaction.js.map +1 -1
  119. package/_esm/actions/public/getFilterChanges.js +1 -0
  120. package/_esm/actions/public/getFilterChanges.js.map +1 -1
  121. package/_esm/actions/public/getFilterLogs.js +1 -0
  122. package/_esm/actions/public/getFilterLogs.js.map +1 -1
  123. package/_esm/actions/public/watchBlockNumber.js +5 -1
  124. package/_esm/actions/public/watchBlockNumber.js.map +1 -1
  125. package/_esm/actions/public/watchBlocks.js +28 -8
  126. package/_esm/actions/public/watchBlocks.js.map +1 -1
  127. package/_esm/actions/public/watchContractEvent.js +15 -5
  128. package/_esm/actions/public/watchContractEvent.js.map +1 -1
  129. package/_esm/actions/public/watchEvent.js +11 -2
  130. package/_esm/actions/public/watchEvent.js.map +1 -1
  131. package/_esm/actions/wallet/prepareTransactionRequest.js +3 -2
  132. package/_esm/actions/wallet/prepareTransactionRequest.js.map +1 -1
  133. package/_esm/actions/wallet/sendTransaction.js +6 -2
  134. package/_esm/actions/wallet/sendTransaction.js.map +1 -1
  135. package/_esm/actions/wallet/sendTransactionSync.js +59 -8
  136. package/_esm/actions/wallet/sendTransactionSync.js.map +1 -1
  137. package/_esm/chains/definitions/hashKeyChain.js +4 -4
  138. package/_esm/chains/definitions/hashKeyChain.js.map +1 -1
  139. package/_esm/chains/definitions/hashkeyChainTestnet.js +4 -4
  140. package/_esm/chains/definitions/hashkeyChainTestnet.js.map +1 -1
  141. package/_esm/chains/definitions/turkchain.js +23 -0
  142. package/_esm/chains/definitions/turkchain.js.map +1 -0
  143. package/_esm/chains/definitions/zksync.js +1 -1
  144. package/_esm/chains/definitions/zksync.js.map +1 -1
  145. package/_esm/chains/index.js +1 -0
  146. package/_esm/chains/index.js.map +1 -1
  147. package/_esm/clients/createClient.js.map +1 -1
  148. package/_esm/clients/transports/fallback.js +8 -0
  149. package/_esm/clients/transports/fallback.js.map +1 -1
  150. package/_esm/errors/node.js +10 -4
  151. package/_esm/errors/node.js.map +1 -1
  152. package/_esm/errors/typedData.js +5 -2
  153. package/_esm/errors/typedData.js.map +1 -1
  154. package/_esm/errors/version.js +1 -1
  155. package/_esm/index.js +1 -1
  156. package/_esm/index.js.map +1 -1
  157. package/_esm/tempo/Account.js +122 -11
  158. package/_esm/tempo/Account.js.map +1 -1
  159. package/_esm/tempo/Gateway.js +294 -0
  160. package/_esm/tempo/Gateway.js.map +1 -0
  161. package/_esm/tempo/GatewayDecorator.js +207 -0
  162. package/_esm/tempo/GatewayDecorator.js.map +1 -0
  163. package/_esm/tempo/Transaction.js +2 -0
  164. package/_esm/tempo/Transaction.js.map +1 -1
  165. package/_esm/tempo/actions/ai.js +132 -0
  166. package/_esm/tempo/actions/ai.js.map +1 -0
  167. package/_esm/tempo/actions/bucket.js +181 -0
  168. package/_esm/tempo/actions/bucket.js.map +1 -0
  169. package/_esm/tempo/actions/compute.js +424 -0
  170. package/_esm/tempo/actions/compute.js.map +1 -0
  171. package/_esm/tempo/actions/gateway.js +22 -0
  172. package/_esm/tempo/actions/gateway.js.map +1 -0
  173. package/_esm/tempo/actions/index.js +10 -0
  174. package/_esm/tempo/actions/index.js.map +1 -1
  175. package/_esm/tempo/actions/kv.js +124 -0
  176. package/_esm/tempo/actions/kv.js.map +1 -0
  177. package/_esm/tempo/chainConfig.js +13 -15
  178. package/_esm/tempo/chainConfig.js.map +1 -1
  179. package/_esm/tempo/index.js +9 -0
  180. package/_esm/tempo/index.js.map +1 -1
  181. package/_esm/tempo/internal/ndjson.js +45 -0
  182. package/_esm/tempo/internal/ndjson.js.map +1 -0
  183. package/_esm/tempo/internal/relay/feePayer.js +24 -7
  184. package/_esm/tempo/internal/relay/feePayer.js.map +1 -1
  185. package/_esm/utils/abi/decodeEventLog.js +69 -7
  186. package/_esm/utils/abi/decodeEventLog.js.map +1 -1
  187. package/_esm/utils/abi/getAbiItem.js +34 -6
  188. package/_esm/utils/abi/getAbiItem.js.map +1 -1
  189. package/_esm/utils/abi/parseEventLogs.js +43 -10
  190. package/_esm/utils/abi/parseEventLogs.js.map +1 -1
  191. package/_esm/utils/authorization/recoverAuthorizationAddress.js +11 -2
  192. package/_esm/utils/authorization/recoverAuthorizationAddress.js.map +1 -1
  193. package/_esm/utils/authorization/verifyAuthorization.js +15 -4
  194. package/_esm/utils/authorization/verifyAuthorization.js.map +1 -1
  195. package/_esm/utils/buildRequest.js +6 -0
  196. package/_esm/utils/buildRequest.js.map +1 -1
  197. package/_esm/utils/ccip.js +163 -31
  198. package/_esm/utils/ccip.js.map +1 -1
  199. package/_esm/utils/ccipTunnel.js +5 -1
  200. package/_esm/utils/ccipTunnel.js.map +1 -1
  201. package/_esm/utils/ens/localBatchGatewayRequest.js +69 -4
  202. package/_esm/utils/ens/localBatchGatewayRequest.js.map +1 -1
  203. package/_esm/utils/hash/toSignatureHash.js +11 -1
  204. package/_esm/utils/hash/toSignatureHash.js.map +1 -1
  205. package/_esm/utils/internal/http.js +83 -0
  206. package/_esm/utils/internal/http.js.map +1 -0
  207. package/_esm/utils/nonceManager.js.map +1 -1
  208. package/_esm/utils/rpc/http.js +12 -78
  209. package/_esm/utils/rpc/http.js.map +1 -1
  210. package/_esm/utils/rpc/socket.js +24 -9
  211. package/_esm/utils/rpc/socket.js.map +1 -1
  212. package/_esm/utils/transaction/assertRequest.js +2 -2
  213. package/_esm/utils/transaction/assertRequest.js.map +1 -1
  214. package/_esm/utils/transaction/assertTransaction.js +2 -2
  215. package/_esm/utils/transaction/assertTransaction.js.map +1 -1
  216. package/_esm/utils/transaction/parseTransaction.js +24 -7
  217. package/_esm/utils/transaction/parseTransaction.js.map +1 -1
  218. package/_esm/utils/typedData.js +25 -8
  219. package/_esm/utils/typedData.js.map +1 -1
  220. package/_esm/zksync/actions/finalizeWithdrawal.js +5 -2
  221. package/_esm/zksync/actions/finalizeWithdrawal.js.map +1 -1
  222. package/_esm/zksync/actions/isWithdrawalFinalized.js +5 -5
  223. package/_esm/zksync/actions/isWithdrawalFinalized.js.map +1 -1
  224. package/_types/account-abstraction/utils/formatters/userOperationReceipt.d.ts.map +1 -1
  225. package/_types/actions/public/estimateGas.d.ts.map +1 -1
  226. package/_types/actions/public/fillTransaction.d.ts.map +1 -1
  227. package/_types/actions/public/getFilterChanges.d.ts.map +1 -1
  228. package/_types/actions/public/getFilterLogs.d.ts.map +1 -1
  229. package/_types/actions/public/watchBlockNumber.d.ts +6 -2
  230. package/_types/actions/public/watchBlockNumber.d.ts.map +1 -1
  231. package/_types/actions/public/watchBlocks.d.ts +7 -2
  232. package/_types/actions/public/watchBlocks.d.ts.map +1 -1
  233. package/_types/actions/public/watchContractEvent.d.ts.map +1 -1
  234. package/_types/actions/public/watchEvent.d.ts.map +1 -1
  235. package/_types/actions/wallet/prepareTransactionRequest.d.ts.map +1 -1
  236. package/_types/actions/wallet/sendTransaction.d.ts.map +1 -1
  237. package/_types/actions/wallet/sendTransactionSync.d.ts.map +1 -1
  238. package/_types/chains/definitions/hashKeyChain.d.ts +4 -4
  239. package/_types/chains/definitions/hashkeyChainTestnet.d.ts +4 -4
  240. package/_types/chains/definitions/turkchain.d.ts +53 -0
  241. package/_types/chains/definitions/turkchain.d.ts.map +1 -0
  242. package/_types/chains/definitions/zksync.d.ts +1 -1
  243. package/_types/chains/index.d.ts +1 -0
  244. package/_types/chains/index.d.ts.map +1 -1
  245. package/_types/clients/createClient.d.ts +6 -0
  246. package/_types/clients/createClient.d.ts.map +1 -1
  247. package/_types/clients/transports/fallback.d.ts.map +1 -1
  248. package/_types/errors/node.d.ts.map +1 -1
  249. package/_types/errors/typedData.d.ts.map +1 -1
  250. package/_types/errors/version.d.ts +1 -1
  251. package/_types/index.d.ts +1 -1
  252. package/_types/index.d.ts.map +1 -1
  253. package/_types/tempo/Account.d.ts +77 -4
  254. package/_types/tempo/Account.d.ts.map +1 -1
  255. package/_types/tempo/Gateway.d.ts +337 -0
  256. package/_types/tempo/Gateway.d.ts.map +1 -0
  257. package/_types/tempo/GatewayDecorator.d.ts +635 -0
  258. package/_types/tempo/GatewayDecorator.d.ts.map +1 -0
  259. package/_types/tempo/Relay.d.ts +1 -1
  260. package/_types/tempo/Relay.d.ts.map +1 -1
  261. package/_types/tempo/Transaction.d.ts +2 -0
  262. package/_types/tempo/Transaction.d.ts.map +1 -1
  263. package/_types/tempo/actions/ai.d.ts +145 -0
  264. package/_types/tempo/actions/ai.d.ts.map +1 -0
  265. package/_types/tempo/actions/bucket.d.ts +210 -0
  266. package/_types/tempo/actions/bucket.d.ts.map +1 -0
  267. package/_types/tempo/actions/compute.d.ts +628 -0
  268. package/_types/tempo/actions/compute.d.ts.map +1 -0
  269. package/_types/tempo/actions/gateway.d.ts +25 -0
  270. package/_types/tempo/actions/gateway.d.ts.map +1 -0
  271. package/_types/tempo/actions/index.d.ts +10 -0
  272. package/_types/tempo/actions/index.d.ts.map +1 -1
  273. package/_types/tempo/actions/kv.d.ts +167 -0
  274. package/_types/tempo/actions/kv.d.ts.map +1 -0
  275. package/_types/tempo/chainConfig.d.ts.map +1 -1
  276. package/_types/tempo/index.d.ts +11 -0
  277. package/_types/tempo/index.d.ts.map +1 -1
  278. package/_types/tempo/internal/ndjson.d.ts +9 -0
  279. package/_types/tempo/internal/ndjson.d.ts.map +1 -0
  280. package/_types/tempo/internal/relay/feePayer.d.ts.map +1 -1
  281. package/_types/tempo/internal/relay/utils.d.ts +8 -8
  282. package/_types/utils/abi/decodeEventLog.d.ts +13 -1
  283. package/_types/utils/abi/decodeEventLog.d.ts.map +1 -1
  284. package/_types/utils/abi/getAbiItem.d.ts.map +1 -1
  285. package/_types/utils/abi/parseEventLogs.d.ts.map +1 -1
  286. package/_types/utils/authorization/recoverAuthorizationAddress.d.ts +2 -1
  287. package/_types/utils/authorization/recoverAuthorizationAddress.d.ts.map +1 -1
  288. package/_types/utils/authorization/verifyAuthorization.d.ts.map +1 -1
  289. package/_types/utils/buildRequest.d.ts.map +1 -1
  290. package/_types/utils/ccip.d.ts +24 -4
  291. package/_types/utils/ccip.d.ts.map +1 -1
  292. package/_types/utils/ccipTunnel.d.ts.map +1 -1
  293. package/_types/utils/ens/localBatchGatewayRequest.d.ts +26 -0
  294. package/_types/utils/ens/localBatchGatewayRequest.d.ts.map +1 -1
  295. package/_types/utils/hash/toSignatureHash.d.ts +1 -1
  296. package/_types/utils/hash/toSignatureHash.d.ts.map +1 -1
  297. package/_types/utils/internal/http.d.ts +16 -0
  298. package/_types/utils/internal/http.d.ts.map +1 -0
  299. package/_types/utils/nonceManager.d.ts +15 -1
  300. package/_types/utils/nonceManager.d.ts.map +1 -1
  301. package/_types/utils/rpc/http.d.ts.map +1 -1
  302. package/_types/utils/rpc/socket.d.ts.map +1 -1
  303. package/_types/utils/transaction/parseTransaction.d.ts.map +1 -1
  304. package/_types/utils/typedData.d.ts.map +1 -1
  305. package/account-abstraction/utils/formatters/userOperationReceipt.ts +1 -0
  306. package/actions/public/estimateGas.ts +12 -5
  307. package/actions/public/fillTransaction.ts +2 -0
  308. package/actions/public/getFilterChanges.ts +1 -0
  309. package/actions/public/getFilterLogs.ts +1 -0
  310. package/actions/public/watchBlockNumber.ts +11 -2
  311. package/actions/public/watchBlocks.ts +46 -14
  312. package/actions/public/watchContractEvent.ts +22 -4
  313. package/actions/public/watchEvent.ts +17 -1
  314. package/actions/wallet/prepareTransactionRequest.ts +6 -2
  315. package/actions/wallet/sendTransaction.ts +9 -3
  316. package/actions/wallet/sendTransactionSync.ts +74 -12
  317. package/chains/definitions/hashKeyChain.ts +4 -4
  318. package/chains/definitions/hashkeyChainTestnet.ts +4 -4
  319. package/chains/definitions/turkchain.ts +23 -0
  320. package/chains/definitions/zksync.ts +1 -1
  321. package/chains/index.ts +1 -0
  322. package/clients/createClient.ts +6 -0
  323. package/clients/transports/fallback.ts +11 -0
  324. package/errors/node.ts +11 -5
  325. package/errors/typedData.ts +5 -2
  326. package/errors/version.ts +1 -1
  327. package/index.ts +2 -0
  328. package/package.json +5 -1
  329. package/tempo/Account.ts +202 -16
  330. package/tempo/Gateway.ts +477 -0
  331. package/tempo/GatewayDecorator.ts +909 -0
  332. package/tempo/Relay.ts +1 -1
  333. package/tempo/Transaction.ts +3 -0
  334. package/tempo/actions/ai.ts +250 -0
  335. package/tempo/actions/bucket.ts +324 -0
  336. package/tempo/actions/compute.ts +894 -0
  337. package/tempo/actions/gateway.ts +33 -0
  338. package/tempo/actions/index.ts +10 -0
  339. package/tempo/actions/kv.ts +229 -0
  340. package/tempo/chainConfig.ts +13 -15
  341. package/tempo/index.ts +12 -0
  342. package/tempo/internal/ndjson.ts +51 -0
  343. package/tempo/internal/relay/feePayer.ts +30 -7
  344. package/utils/abi/decodeEventLog.ts +97 -10
  345. package/utils/abi/getAbiItem.ts +35 -5
  346. package/utils/abi/parseEventLogs.ts +48 -11
  347. package/utils/authorization/recoverAuthorizationAddress.ts +18 -2
  348. package/utils/authorization/verifyAuthorization.ts +12 -7
  349. package/utils/buildRequest.ts +4 -0
  350. package/utils/ccip.ts +199 -33
  351. package/utils/ccipTunnel.ts +5 -1
  352. package/utils/ens/localBatchGatewayRequest.ts +82 -4
  353. package/utils/hash/toSignatureHash.ts +12 -2
  354. package/utils/internal/http.ts +92 -0
  355. package/utils/nonceManager.ts +16 -1
  356. package/utils/rpc/http.ts +12 -86
  357. package/utils/rpc/socket.ts +28 -15
  358. package/utils/transaction/assertRequest.ts +2 -2
  359. package/utils/transaction/assertTransaction.ts +2 -2
  360. package/utils/transaction/parseTransaction.ts +32 -7
  361. package/utils/typedData.ts +31 -8
  362. package/zksync/actions/finalizeWithdrawal.ts +5 -2
  363. package/zksync/actions/isWithdrawalFinalized.ts +5 -5
@@ -23,10 +23,29 @@ function parseEventLogs(parameters) {
23
23
  abi: abiItem,
24
24
  selector: (0, toEventSelector_js_1.toEventSelector)(abiItem),
25
25
  }));
26
+ const anonymousTopics = (() => {
27
+ if (eventName)
28
+ return abiTopics.filter((item) => item.abi.anonymous && eventName.includes(item.abi.name));
29
+ if (abiTopics.every((item) => item.abi.anonymous))
30
+ return abiTopics;
31
+ return [];
32
+ })();
26
33
  return logs
27
34
  .map((log) => {
28
35
  const formattedLog = typeof log.blockNumber === 'string' ? (0, log_js_1.formatLog)(log) : log;
29
- const abiItems = abiTopics.filter((abiTopic) => formattedLog.topics[0] === abiTopic.selector);
36
+ const bySelector = abiTopics.filter((item) => !item.abi.anonymous && formattedLog.topics[0] === item.selector);
37
+ const abiItems = (() => {
38
+ if (bySelector.length > 0) {
39
+ if (!eventName)
40
+ return bySelector;
41
+ return bySelector.filter((item) => eventName.includes(item.abi.name));
42
+ }
43
+ const anonymous = anonymousTopics.filter((item) => (item.abi.inputs?.filter((input) => input.indexed).length ?? 0) ===
44
+ formattedLog.topics.length);
45
+ if (anonymous.length === 1)
46
+ return anonymous;
47
+ return [];
48
+ })();
30
49
  if (abiItems.length === 0)
31
50
  return null;
32
51
  let event;
@@ -45,7 +64,10 @@ function parseEventLogs(parameters) {
45
64
  }
46
65
  }
47
66
  if (!event && !strict) {
48
- abiItem = abiItems[0];
67
+ const fallback = abiItems[0];
68
+ if (!fallback || fallback.abi.anonymous)
69
+ return null;
70
+ abiItem = fallback;
49
71
  try {
50
72
  event = (0, decodeEventLog_js_1.decodeEventLog)({
51
73
  data: formattedLog.data,
@@ -64,6 +86,7 @@ function parseEventLogs(parameters) {
64
86
  if (eventName && !eventName.includes(event.eventName))
65
87
  return null;
66
88
  if (!includesArgs({
89
+ anonymous: abiItem.abi.anonymous,
67
90
  args: event.args,
68
91
  inputs: abiItem.abi.inputs,
69
92
  matchArgs: args,
@@ -75,14 +98,14 @@ function parseEventLogs(parameters) {
75
98
  .filter(Boolean);
76
99
  }
77
100
  function includesArgs(parameters) {
78
- const { args, inputs, matchArgs, topics } = parameters;
101
+ const { anonymous, args, inputs, matchArgs, topics } = parameters;
79
102
  if (!matchArgs)
80
103
  return true;
81
104
  if (!args)
82
105
  return false;
83
106
  const topicInputs = inputs
84
107
  .filter((input) => input.indexed)
85
- .slice(0, topics.length - 1);
108
+ .slice(0, anonymous ? topics.length : topics.length - 1);
86
109
  function isEqual(input, value, arg) {
87
110
  try {
88
111
  if (input.type === 'address')
@@ -1 +1 @@
1
- {"version":3,"file":"parseEventLogs.js","sourceRoot":"","sources":["../../../utils/abi/parseEventLogs.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"parseEventLogs.js","sourceRoot":"","sources":["../../../utils/abi/parseEventLogs.ts"],"names":[],"mappings":"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"}
@@ -1,13 +1,20 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.recoverAuthorizationAddress = recoverAuthorizationAddress;
4
+ const transaction_js_1 = require("../../errors/transaction.js");
4
5
  const recoverAddress_js_1 = require("../signature/recoverAddress.js");
5
6
  const hashAuthorization_js_1 = require("./hashAuthorization.js");
6
7
  async function recoverAuthorizationAddress(parameters) {
7
- const { authorization, signature } = parameters;
8
+ const { authorization } = parameters;
9
+ const signature = (parameters.signature ?? authorization);
10
+ if (typeof signature === 'object' &&
11
+ typeof signature.yParity === 'number' &&
12
+ signature.yParity !== 0 &&
13
+ signature.yParity !== 1)
14
+ throw new transaction_js_1.InvalidYParityError({ yParity: BigInt(signature.yParity) });
8
15
  return (0, recoverAddress_js_1.recoverAddress)({
9
16
  hash: (0, hashAuthorization_js_1.hashAuthorization)(authorization),
10
- signature: (signature ?? authorization),
17
+ signature,
11
18
  });
12
19
  }
13
20
  //# sourceMappingURL=recoverAuthorizationAddress.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"recoverAuthorizationAddress.js","sourceRoot":"","sources":["../../../utils/authorization/recoverAuthorizationAddress.ts"],"names":[],"mappings":";;AAoDA,kEAaC;AAvDD,sEAGuC;AACvC,iEAG+B;AAmCxB,KAAK,UAAU,2BAA2B,CAK/C,UAAgE;IAEhE,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,UAAU,CAAA;IAE/C,OAAO,IAAA,kCAAc,EAAC;QACpB,IAAI,EAAE,IAAA,wCAAiB,EAAC,aAAqC,CAAC;QAC9D,SAAS,EAAE,CAAC,SAAS,IAAI,aAAa,CAAc;KACrD,CAAC,CAAA;AACJ,CAAC"}
1
+ {"version":3,"file":"recoverAuthorizationAddress.js","sourceRoot":"","sources":["../../../utils/authorization/recoverAuthorizationAddress.ts"],"names":[],"mappings":";;AAyDA,kEAwBC;AA/ED,gEAGoC;AASpC,sEAGuC;AACvC,iEAG+B;AAoCxB,KAAK,UAAU,2BAA2B,CAK/C,UAAgE;IAEhE,MAAM,EAAE,aAAa,EAAE,GAAG,UAAU,CAAA;IACpC,MAAM,SAAS,GAAG,CAAC,UAAU,CAAC,SAAS,IAAI,aAAa,CAAc,CAAA;IAItE,IACE,OAAO,SAAS,KAAK,QAAQ;QAC7B,OAAO,SAAS,CAAC,OAAO,KAAK,QAAQ;QACrC,SAAS,CAAC,OAAO,KAAK,CAAC;QACvB,SAAS,CAAC,OAAO,KAAK,CAAC;QAEvB,MAAM,IAAI,oCAAmB,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAEvE,OAAO,IAAA,kCAAc,EAAC;QACpB,IAAI,EAAE,IAAA,wCAAiB,EAAC,aAAqC,CAAC;QAC9D,SAAS;KACV,CAAC,CAAA;AACJ,CAAC"}
@@ -1,13 +1,23 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.verifyAuthorization = verifyAuthorization;
4
+ const transaction_js_1 = require("../../errors/transaction.js");
4
5
  const getAddress_js_1 = require("../address/getAddress.js");
5
6
  const isAddressEqual_js_1 = require("../address/isAddressEqual.js");
6
7
  const recoverAuthorizationAddress_js_1 = require("./recoverAuthorizationAddress.js");
7
8
  async function verifyAuthorization({ address, authorization, signature, }) {
8
- return (0, isAddressEqual_js_1.isAddressEqual)((0, getAddress_js_1.getAddress)(address), await (0, recoverAuthorizationAddress_js_1.recoverAuthorizationAddress)({
9
- authorization,
10
- signature,
11
- }));
9
+ const recovered = await (async () => {
10
+ try {
11
+ return await (0, recoverAuthorizationAddress_js_1.recoverAuthorizationAddress)({ authorization, signature });
12
+ }
13
+ catch (error) {
14
+ if (error instanceof transaction_js_1.InvalidYParityError)
15
+ return undefined;
16
+ throw error;
17
+ }
18
+ })();
19
+ if (!recovered)
20
+ return false;
21
+ return (0, isAddressEqual_js_1.isAddressEqual)((0, getAddress_js_1.getAddress)(address), recovered);
12
22
  }
13
23
  //# sourceMappingURL=verifyAuthorization.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"verifyAuthorization.js","sourceRoot":"","sources":["../../../utils/authorization/verifyAuthorization.ts"],"names":[],"mappings":";;AAoCA,kDAYC;AA7CD,4DAA+E;AAC/E,oEAGqC;AACrC,qFAIyC;AAwBlC,KAAK,UAAU,mBAAmB,CAAC,EACxC,OAAO,EACP,aAAa,EACb,SAAS,GACqB;IAC9B,OAAO,IAAA,kCAAc,EACnB,IAAA,0BAAU,EAAC,OAAO,CAAC,EACnB,MAAM,IAAA,4DAA2B,EAAC;QAChC,aAAa;QACb,SAAS;KACV,CAAC,CACH,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"verifyAuthorization.js","sourceRoot":"","sources":["../../../utils/authorization/verifyAuthorization.ts"],"names":[],"mappings":";;AAqCA,kDAgBC;AAnDD,gEAAiE;AAEjE,4DAA+E;AAC/E,oEAGqC;AACrC,qFAIyC;AAwBlC,KAAK,UAAU,mBAAmB,CAAC,EACxC,OAAO,EACP,aAAa,EACb,SAAS,GACqB;IAC9B,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE;QAClC,IAAI,CAAC;YACH,OAAO,MAAM,IAAA,4DAA2B,EAAC,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,CAAA;QACxE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAEf,IAAI,KAAK,YAAY,oCAAmB;gBAAE,OAAO,SAAS,CAAA;YAC1D,MAAM,KAAK,CAAA;QACb,CAAC;IACH,CAAC,CAAC,EAAE,CAAA;IACJ,IAAI,CAAC,SAAS;QAAE,OAAO,KAAK,CAAA;IAC5B,OAAO,IAAA,kCAAc,EAAC,IAAA,0BAAU,EAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAA;AACvD,CAAC"}
@@ -136,6 +136,10 @@ function shouldRetry(error) {
136
136
  return true;
137
137
  if (error.code === -32007)
138
138
  return true;
139
+ if (error.code === rpc_js_1.MethodNotFoundRpcError.code)
140
+ return false;
141
+ if (error.code === rpc_js_1.MethodNotSupportedRpcError.code)
142
+ return false;
139
143
  if (!status)
140
144
  return false;
141
145
  }
@@ -1 +1 @@
1
- {"version":3,"file":"buildRequest.js","sourceRoot":"","sources":["../../utils/buildRequest.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"buildRequest.js","sourceRoot":"","sources":["../../utils/buildRequest.ts"],"names":[],"mappings":"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"}
@@ -13,7 +13,11 @@ const isAddressEqual_js_1 = require("./address/isAddressEqual.js");
13
13
  const concat_js_1 = require("./data/concat.js");
14
14
  const isHex_js_1 = require("./data/isHex.js");
15
15
  const localBatchGatewayRequest_js_1 = require("./ens/localBatchGatewayRequest.js");
16
+ const http_js_1 = require("./internal/http.js");
17
+ const withTimeout_js_1 = require("./promise/withTimeout.js");
16
18
  const stringify_js_1 = require("./stringify.js");
19
+ const ccipTimeout = 10_000;
20
+ const maxCcipResponseBytes = 10_485_760;
17
21
  exports.offchainLookupSignature = '0x556f1830';
18
22
  exports.offchainLookupAbiItem = {
19
23
  name: 'OffchainLookup',
@@ -41,7 +45,7 @@ exports.offchainLookupAbiItem = {
41
45
  },
42
46
  ],
43
47
  };
44
- async function offchainLookup(client, { blockNumber, blockTag, data, requestOptions, to, }) {
48
+ async function offchainLookup(client, { blockNumber, blockTag, budget = (0, localBatchGatewayRequest_js_1.createCcipReadBudget)(), data, depth = 0, requestOptions, to, }) {
45
49
  const { args } = (0, decodeErrorResult_js_1.decodeErrorResult)({
46
50
  data,
47
51
  abi: [exports.offchainLookupAbiItem],
@@ -51,26 +55,69 @@ async function offchainLookup(client, { blockNumber, blockTag, data, requestOpti
51
55
  const ccipRequest_ = ccipRead && typeof ccipRead?.request === 'function'
52
56
  ? ccipRead.request
53
57
  : ccipRequest;
58
+ const timeout = getTransportTimeout(client.transport);
54
59
  try {
60
+ if (depth >= localBatchGatewayRequest_js_1.ccipReadLimit.depth)
61
+ throw new request_js_1.HttpRequestError({
62
+ details: `CCIP Read exceeded the maximum callback depth (${localBatchGatewayRequest_js_1.ccipReadLimit.depth}).`,
63
+ url: urls[0] ?? '',
64
+ });
55
65
  if (!(0, isAddressEqual_js_1.isAddressEqual)(to, sender))
56
66
  throw new ccip_js_1.OffchainLookupSenderMismatchError({ sender, to });
57
- const result = urls.includes(localBatchGatewayRequest_js_1.localBatchGatewayUrl)
58
- ? await (0, localBatchGatewayRequest_js_1.localBatchGatewayRequest)({
67
+ const result = await (async () => {
68
+ if (urls.includes(localBatchGatewayRequest_js_1.localBatchGatewayUrl))
69
+ return (0, localBatchGatewayRequest_js_1.localBatchGatewayRequest)({
70
+ budget,
71
+ ccipRequest: (parameters) => ccipRequest_({
72
+ ...parameters,
73
+ requestOptions,
74
+ timeout: parameters.timeout ?? timeout,
75
+ }),
76
+ data: callData,
77
+ });
78
+ if (budget.queries <= 0)
79
+ throw new request_js_1.HttpRequestError({
80
+ details: `CCIP Read exceeded the maximum number of queries (${localBatchGatewayRequest_js_1.ccipReadLimit.queries}).`,
81
+ url: urls[0] ?? '',
82
+ });
83
+ const urls_ = urls.slice(0, budget.queries);
84
+ budget.queries -= Math.max(1, urls_.length);
85
+ return budget.run(() => ccipRequest_({
59
86
  data: callData,
60
- ccipRequest: (parameters) => ccipRequest_({ ...parameters, requestOptions }),
61
- })
62
- : await ccipRequest_({ data: callData, requestOptions, sender, urls });
63
- const { data: data_ } = await (0, call_js_1.call)(client, {
64
- blockNumber,
65
- blockTag,
66
- data: (0, concat_js_1.concat)([
67
- callbackSelector,
68
- (0, encodeAbiParameters_js_1.encodeAbiParameters)([{ type: 'bytes' }, { type: 'bytes' }], [result, extraData]),
69
- ]),
70
- requestOptions,
71
- to,
72
- });
73
- return data_;
87
+ requestOptions,
88
+ sender,
89
+ timeout,
90
+ urls: urls_,
91
+ }));
92
+ })();
93
+ const callbackData = (0, concat_js_1.concat)([
94
+ callbackSelector,
95
+ (0, encodeAbiParameters_js_1.encodeAbiParameters)([{ type: 'bytes' }, { type: 'bytes' }], [result, extraData]),
96
+ ]);
97
+ try {
98
+ const { data: data_ } = await (0, call_js_1.call)({ ...client, ccipRead: false }, {
99
+ blockNumber,
100
+ blockTag,
101
+ data: callbackData,
102
+ requestOptions,
103
+ to,
104
+ });
105
+ return data_;
106
+ }
107
+ catch (err) {
108
+ const revertData = (0, call_js_1.getRevertErrorData)(err);
109
+ if (revertData?.slice(0, 10) !== exports.offchainLookupSignature)
110
+ throw err;
111
+ return await offchainLookup(client, {
112
+ blockNumber,
113
+ blockTag,
114
+ budget,
115
+ data: revertData,
116
+ depth: depth + 1,
117
+ requestOptions,
118
+ to,
119
+ });
120
+ }
74
121
  }
75
122
  catch (err) {
76
123
  if (requestOptions?.signal?.aborted)
@@ -87,28 +134,53 @@ async function offchainLookup(client, { blockNumber, blockTag, data, requestOpti
87
134
  });
88
135
  }
89
136
  }
90
- async function ccipRequest({ data, requestOptions, sender, urls, }) {
137
+ async function ccipRequest({ data, requestOptions, sender, timeout = ccipTimeout, urls, }) {
91
138
  let error = new Error('An unknown error occurred.');
92
- for (let i = 0; i < urls.length; i++) {
139
+ for (const url of urls) {
93
140
  if (requestOptions?.signal?.aborted)
94
141
  throw (0, utils_js_1.getAbortError)(requestOptions.signal);
95
- const url = urls[i];
142
+ const requestUrl = url
143
+ .replace('{sender}', sender.toLowerCase())
144
+ .replace('{data}', data);
96
145
  const method = url.includes('{data}') ? 'GET' : 'POST';
97
146
  const body = method === 'POST' ? { data, sender } : undefined;
98
147
  const headers = method === 'POST' ? { 'Content-Type': 'application/json' } : {};
99
148
  try {
100
- const response = await fetch(url.replace('{sender}', sender.toLowerCase()).replace('{data}', data), {
101
- body: JSON.stringify(body),
102
- headers,
103
- method,
104
- ...(requestOptions?.signal ? { signal: requestOptions.signal } : {}),
149
+ assertCcipUrl(requestUrl);
150
+ const { response, responseBody } = await (0, withTimeout_js_1.withTimeout)(async ({ signal: timeoutSignal }) => {
151
+ const { signal, cleanup } = (0, http_js_1.anySignal)([
152
+ requestOptions?.signal,
153
+ timeout > 0 ? timeoutSignal : null,
154
+ ]);
155
+ try {
156
+ const response = await fetch(requestUrl, {
157
+ body: JSON.stringify(body),
158
+ headers,
159
+ method,
160
+ ...(signal ? { signal } : {}),
161
+ });
162
+ const responseBody = await (0, http_js_1.readResponseBody)(response, {
163
+ maxResponseBodySize: maxCcipResponseBytes,
164
+ });
165
+ return { response, responseBody };
166
+ }
167
+ finally {
168
+ cleanup();
169
+ }
170
+ }, {
171
+ errorInstance: new request_js_1.TimeoutError({
172
+ body: body ?? { data, sender },
173
+ url,
174
+ }),
175
+ signal: true,
176
+ timeout,
105
177
  });
106
178
  let result;
107
179
  if (response.headers.get('Content-Type')?.startsWith('application/json')) {
108
- result = (await response.json()).data;
180
+ result = JSON.parse(responseBody).data;
109
181
  }
110
182
  else {
111
- result = (await response.text());
183
+ result = responseBody;
112
184
  }
113
185
  if (!response.ok) {
114
186
  error = new request_js_1.HttpRequestError({
@@ -136,13 +208,47 @@ async function ccipRequest({ data, requestOptions, sender, urls, }) {
136
208
  throw (0, utils_js_1.getAbortError)(requestOptions.signal);
137
209
  if ((0, utils_js_1.isAbortError)(err))
138
210
  throw err;
211
+ if (err instanceof request_js_1.HttpRequestError ||
212
+ err instanceof request_js_1.TimeoutError ||
213
+ err instanceof request_js_1.ResponseBodyTooLargeError) {
214
+ error = err;
215
+ continue;
216
+ }
139
217
  error = new request_js_1.HttpRequestError({
140
218
  body,
141
- details: err.message,
219
+ cause: err,
142
220
  url,
143
221
  });
144
222
  }
145
223
  }
146
224
  throw error;
147
225
  }
226
+ function assertCcipUrl(url) {
227
+ const parsed = (() => {
228
+ try {
229
+ return new URL(url);
230
+ }
231
+ catch {
232
+ throw new request_js_1.HttpRequestError({
233
+ details: 'CCIP Read URL is invalid.',
234
+ url,
235
+ });
236
+ }
237
+ })();
238
+ if (parsed.protocol === 'http:' || parsed.protocol === 'https:')
239
+ return;
240
+ throw new request_js_1.HttpRequestError({
241
+ details: `CCIP Read URL scheme "${parsed.protocol.slice(0, -1)}" is not allowed.`,
242
+ url,
243
+ });
244
+ }
245
+ function getTransportTimeout(transport) {
246
+ const timeout = transport.timeout ?? transport.config?.timeout;
247
+ if (timeout !== undefined)
248
+ return timeout;
249
+ const timeouts = (transport.transports ?? transport.value?.transports ?? [])
250
+ .map(getTransportTimeout)
251
+ .filter((timeout) => timeout !== undefined);
252
+ return timeouts.length ? Math.max(...timeouts) : undefined;
253
+ }
148
254
  //# sourceMappingURL=ccip.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ccip.js","sourceRoot":"","sources":["../../utils/ccip.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ccip.js","sourceRoot":"","sources":["../../utils/ccip.ts"],"names":[],"mappings":"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"}
@@ -11,11 +11,13 @@ const ccip_js_1 = require("./ccip.js");
11
11
  const localBatchGatewayRequest_js_1 = require("./ens/localBatchGatewayRequest.js");
12
12
  function ccipReadTunnel({ batchGateways, ccipRequest = ccip_js_1.ccipRequest, }) {
13
13
  return {
14
- async request({ data, sender, urls }) {
14
+ async request({ data, requestOptions, sender, timeout, urls }) {
15
15
  if (urls.includes(localBatchGatewayRequest_js_1.localBatchGatewayUrl)) {
16
16
  return ccipRequest({
17
17
  data,
18
+ requestOptions,
18
19
  sender,
20
+ timeout,
19
21
  urls: batchGateways,
20
22
  });
21
23
  }
@@ -29,7 +31,9 @@ function ccipReadTunnel({ batchGateways, ccipRequest = ccip_js_1.ccipRequest, })
29
31
  functionName: 'query',
30
32
  args: [[{ sender, data, urls }]],
31
33
  }),
34
+ requestOptions,
32
35
  sender,
36
+ timeout,
33
37
  urls: batchGateways,
34
38
  }),
35
39
  });
@@ -1 +1 @@
1
- {"version":3,"file":"ccipTunnel.js","sourceRoot":"","sources":["../../utils/ccipTunnel.ts"],"names":[],"mappings":";;AAcA,wCAoDC;AAlED,kDAAsD;AACtD,0DAAwD;AACxD,qDAAuD;AACvD,qEAA8D;AAC9D,2EAAoE;AACpE,uEAAgE;AAChE,uCAAuD;AACvD,mFAAwE;AAOxE,SAAgB,cAAc,CAAC,EAC7B,aAAa,EACb,WAAW,GAAG,qBAAY,GACD;IACzB,OAAO;QACL,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;YAClC,IAAI,IAAI,CAAC,QAAQ,CAAC,kDAAoB,CAAC,EAAE,CAAC;gBACxC,OAAO,WAAW,CAAC;oBACjB,IAAI;oBACJ,MAAM;oBACN,IAAI,EAAE,aAAa;iBACpB,CAAC,CAAA;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,IAAA,8CAAoB,EAAC;oBACjD,GAAG,EAAE,yBAAe;oBACpB,YAAY,EAAE,OAAO;oBACrB,IAAI,EAAE,MAAM,WAAW,CAAC;wBACtB,IAAI,EAAE,IAAA,0CAAkB,EAAC;4BACvB,GAAG,EAAE,yBAAe;4BACpB,YAAY,EAAE,OAAO;4BACrB,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;yBACjC,CAAC;wBACF,MAAM;wBACN,IAAI,EAAE,aAAa;qBACpB,CAAC;iBACH,CAAC,CAAA;gBACF,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;oBAChB,IAAI,KAAwB,CAAA;oBAC5B,IAAI,CAAC;wBACH,MAAM,GAAG,GAAG,IAAA,wCAAiB,EAAC;4BAC5B,GAAG,EAAE,CAAC,GAAG,yBAAe,EAAE,2BAAa,CAAC;4BACxC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;yBACnB,CAAC,CAAA;wBACF,IAAI,GAAG,CAAC,SAAS,KAAK,WAAW,EAAE,CAAC;4BAClC,KAAK,GAAG,IAAI,6BAAgB,CAAC;gCAC3B,IAAI,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;gCAC9B,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;gCACnB,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;6BACtB,CAAC,CAAA;wBACJ,CAAC;6BAAM,CAAC;4BACN,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;4BAC3B,IAAI,OAAO,EAAE,CAAC;gCACZ,KAAK,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,CAAA;4BAC5B,CAAC;wBACH,CAAC;oBACH,CAAC;oBAAC,MAAM,CAAC,CAAA,CAAC;oBACV,MAAM,KAAK,IAAI,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;gBACxD,CAAC;gBACD,OAAO,SAAS,CAAC,CAAC,CAAC,CAAA;YACrB,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"ccipTunnel.js","sourceRoot":"","sources":["../../utils/ccipTunnel.ts"],"names":[],"mappings":";;AAcA,wCAwDC;AAtED,kDAAsD;AACtD,0DAAwD;AACxD,qDAAuD;AACvD,qEAA8D;AAC9D,2EAAoE;AACpE,uEAAgE;AAChE,uCAAuD;AACvD,mFAAwE;AAOxE,SAAgB,cAAc,CAAC,EAC7B,aAAa,EACb,WAAW,GAAG,qBAAY,GACD;IACzB,OAAO;QACL,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE;YAC3D,IAAI,IAAI,CAAC,QAAQ,CAAC,kDAAoB,CAAC,EAAE,CAAC;gBACxC,OAAO,WAAW,CAAC;oBACjB,IAAI;oBACJ,cAAc;oBACd,MAAM;oBACN,OAAO;oBACP,IAAI,EAAE,aAAa;iBACpB,CAAC,CAAA;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,IAAA,8CAAoB,EAAC;oBACjD,GAAG,EAAE,yBAAe;oBACpB,YAAY,EAAE,OAAO;oBACrB,IAAI,EAAE,MAAM,WAAW,CAAC;wBACtB,IAAI,EAAE,IAAA,0CAAkB,EAAC;4BACvB,GAAG,EAAE,yBAAe;4BACpB,YAAY,EAAE,OAAO;4BACrB,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;yBACjC,CAAC;wBACF,cAAc;wBACd,MAAM;wBACN,OAAO;wBACP,IAAI,EAAE,aAAa;qBACpB,CAAC;iBACH,CAAC,CAAA;gBACF,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;oBAChB,IAAI,KAAwB,CAAA;oBAC5B,IAAI,CAAC;wBACH,MAAM,GAAG,GAAG,IAAA,wCAAiB,EAAC;4BAC5B,GAAG,EAAE,CAAC,GAAG,yBAAe,EAAE,2BAAa,CAAC;4BACxC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;yBACnB,CAAC,CAAA;wBACF,IAAI,GAAG,CAAC,SAAS,KAAK,WAAW,EAAE,CAAC;4BAClC,KAAK,GAAG,IAAI,6BAAgB,CAAC;gCAC3B,IAAI,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;gCAC9B,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;gCACnB,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;6BACtB,CAAC,CAAA;wBACJ,CAAC;6BAAM,CAAC;4BACN,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;4BAC3B,IAAI,OAAO,EAAE,CAAC;gCACZ,KAAK,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,CAAA;4BAC5B,CAAC;wBACH,CAAC;oBACH,CAAC;oBAAC,MAAM,CAAC,CAAA,CAAC;oBACV,MAAM,KAAK,IAAI,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;gBACxD,CAAC;gBACD,OAAO,SAAS,CAAC,CAAC,CAAC,CAAA;YACrB,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC"}
@@ -1,23 +1,73 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.localBatchGatewayUrl = void 0;
3
+ exports.ccipReadLimit = exports.localBatchGatewayUrl = void 0;
4
+ exports.createCcipReadBudget = createCcipReadBudget;
4
5
  exports.localBatchGatewayRequest = localBatchGatewayRequest;
5
6
  const abis_js_1 = require("../../constants/abis.js");
6
7
  const solidity_js_1 = require("../../constants/solidity.js");
8
+ const request_js_1 = require("../../errors/request.js");
7
9
  const decodeFunctionData_js_1 = require("../abi/decodeFunctionData.js");
8
10
  const encodeErrorResult_js_1 = require("../abi/encodeErrorResult.js");
9
11
  const encodeFunctionResult_js_1 = require("../abi/encodeFunctionResult.js");
10
12
  exports.localBatchGatewayUrl = 'x-batch-gateway:true';
13
+ exports.ccipReadLimit = {
14
+ concurrency: 16,
15
+ depth: 4,
16
+ queries: 256,
17
+ };
18
+ function createCcipReadBudget() {
19
+ let active = 0;
20
+ const queue = [];
21
+ return {
22
+ queries: exports.ccipReadLimit.queries,
23
+ async run(fn) {
24
+ if (active >= exports.ccipReadLimit.concurrency)
25
+ await new Promise((resolve) => queue.push(resolve));
26
+ else
27
+ active++;
28
+ try {
29
+ return await fn();
30
+ }
31
+ finally {
32
+ const next = queue.shift();
33
+ if (next)
34
+ next();
35
+ else
36
+ active--;
37
+ }
38
+ },
39
+ };
40
+ }
11
41
  async function localBatchGatewayRequest(parameters) {
12
- const { data, ccipRequest } = parameters;
42
+ const { data, ccipRequest, budget = createCcipReadBudget(), depth = 0, } = parameters;
13
43
  const { args: [queries], } = (0, decodeFunctionData_js_1.decodeFunctionData)({ abi: abis_js_1.batchGatewayAbi, data });
14
44
  const failures = [];
15
45
  const responses = [];
16
46
  await Promise.all(queries.map(async (query, i) => {
17
47
  try {
18
- responses[i] = query.urls.includes(exports.localBatchGatewayUrl)
19
- ? await localBatchGatewayRequest({ data: query.data, ccipRequest })
20
- : await ccipRequest(query);
48
+ const nested = query.urls.includes(exports.localBatchGatewayUrl);
49
+ if (nested && depth + 1 >= exports.ccipReadLimit.depth)
50
+ throw new request_js_1.HttpRequestError({
51
+ details: `CCIP Read exceeded the maximum batch depth (${exports.ccipReadLimit.depth}).`,
52
+ url: exports.localBatchGatewayUrl,
53
+ });
54
+ if (nested)
55
+ responses[i] = await localBatchGatewayRequest({
56
+ data: query.data,
57
+ ccipRequest,
58
+ budget,
59
+ depth: depth + 1,
60
+ });
61
+ else {
62
+ if (budget.queries <= 0)
63
+ throw new request_js_1.HttpRequestError({
64
+ details: `CCIP Read exceeded the maximum number of queries (${exports.ccipReadLimit.queries}).`,
65
+ url: query.urls[0] ?? '',
66
+ });
67
+ const urls = query.urls.slice(0, budget.queries);
68
+ budget.queries -= Math.max(1, urls.length);
69
+ responses[i] = await budget.run(() => ccipRequest({ ...query, urls }));
70
+ }
21
71
  failures[i] = false;
22
72
  }
23
73
  catch (err) {
@@ -1 +1 @@
1
- {"version":3,"file":"localBatchGatewayRequest.js","sourceRoot":"","sources":["../../../utils/ens/localBatchGatewayRequest.ts"],"names":[],"mappings":";;;AAcA,4DAiCC;AA/CD,qDAAyD;AACzD,6DAA2D;AAE3D,wEAAiE;AACjE,sEAA+D;AAC/D,4EAAqE;AAOxD,QAAA,oBAAoB,GAAG,sBAAsB,CAAA;AAEnD,KAAK,UAAU,wBAAwB,CAAC,UAK9C;IACC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,UAAU,CAAA;IAExC,MAAM,EACJ,IAAI,EAAE,CAAC,OAAO,CAAC,GAChB,GAAG,IAAA,0CAAkB,EAAC,EAAE,GAAG,EAAE,yBAAe,EAAE,IAAI,EAAE,CAAC,CAAA;IAEtD,MAAM,QAAQ,GAAc,EAAE,CAAA;IAC9B,MAAM,SAAS,GAAU,EAAE,CAAA;IAC3B,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAC7B,IAAI,CAAC;YACH,SAAS,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,4BAAoB,CAAC;gBACtD,CAAC,CAAC,MAAM,wBAAwB,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,WAAW,EAAE,CAAC;gBACnE,CAAC,CAAC,MAAM,WAAW,CAAC,KAAK,CAAC,CAAA;YAC5B,QAAQ,CAAC,CAAC,CAAC,GAAG,KAAK,CAAA;QACrB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,CAAA;YAClB,SAAS,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,GAA2B,CAAC,CAAA;QACzD,CAAC;IACH,CAAC,CAAC,CACH,CAAA;IAED,OAAO,IAAA,8CAAoB,EAAC;QAC1B,GAAG,EAAE,yBAAe;QACpB,YAAY,EAAE,OAAO;QACrB,MAAM,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC;KAC9B,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,KAA2B;IAC9C,IAAI,KAAK,CAAC,IAAI,KAAK,kBAAkB,IAAI,KAAK,CAAC,MAAM;QACnD,OAAO,IAAA,wCAAiB,EAAC;YACvB,GAAG,EAAE,yBAAe;YACpB,SAAS,EAAE,WAAW;YACtB,IAAI,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,YAAY,CAAC;SACzC,CAAC,CAAA;IACJ,OAAO,IAAA,wCAAiB,EAAC;QACvB,GAAG,EAAE,CAAC,2BAAa,CAAC;QACpB,SAAS,EAAE,OAAO;QAClB,IAAI,EAAE,CAAC,cAAc,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;KACrE,CAAC,CAAA;AACJ,CAAC"}
1
+ {"version":3,"file":"localBatchGatewayRequest.js","sourceRoot":"","sources":["../../../utils/ens/localBatchGatewayRequest.ts"],"names":[],"mappings":";;;AAwCA,oDAoBC;AAED,4DA+DC;AA7HD,qDAAyD;AACzD,6DAA2D;AAC3D,wDAA0D;AAE1D,wEAAiE;AACjE,sEAA+D;AAC/D,4EAAqE;AAOxD,QAAA,oBAAoB,GAAG,sBAAsB,CAAA;AAY7C,QAAA,aAAa,GAAG;IAC3B,WAAW,EAAE,EAAE;IACf,KAAK,EAAE,CAAC;IACR,OAAO,EAAE,GAAG;CACJ,CAAA;AAWV,SAAgB,oBAAoB;IAClC,IAAI,MAAM,GAAG,CAAC,CAAA;IACd,MAAM,KAAK,GAAmB,EAAE,CAAA;IAChC,OAAO;QACL,OAAO,EAAE,qBAAa,CAAC,OAAO;QAC9B,KAAK,CAAC,GAAG,CAAC,EAAE;YACV,IAAI,MAAM,IAAI,qBAAa,CAAC,WAAW;gBACrC,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;;gBACtD,MAAM,EAAE,CAAA;YACb,IAAI,CAAC;gBACH,OAAO,MAAM,EAAE,EAAE,CAAA;YACnB,CAAC;oBAAS,CAAC;gBAGT,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,EAAE,CAAA;gBAC1B,IAAI,IAAI;oBAAE,IAAI,EAAE,CAAA;;oBACX,MAAM,EAAE,CAAA;YACf,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC;AAEM,KAAK,UAAU,wBAAwB,CAAC,UAO9C;IACC,MAAM,EACJ,IAAI,EACJ,WAAW,EACX,MAAM,GAAG,oBAAoB,EAAE,EAC/B,KAAK,GAAG,CAAC,GACV,GAAG,UAAU,CAAA;IAEd,MAAM,EACJ,IAAI,EAAE,CAAC,OAAO,CAAC,GAChB,GAAG,IAAA,0CAAkB,EAAC,EAAE,GAAG,EAAE,yBAAe,EAAE,IAAI,EAAE,CAAC,CAAA;IAEtD,MAAM,QAAQ,GAAc,EAAE,CAAA;IAC9B,MAAM,SAAS,GAAU,EAAE,CAAA;IAC3B,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAC7B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,4BAAoB,CAAC,CAAA;YACxD,IAAI,MAAM,IAAI,KAAK,GAAG,CAAC,IAAI,qBAAa,CAAC,KAAK;gBAC5C,MAAM,IAAI,6BAAgB,CAAC;oBACzB,OAAO,EAAE,+CAA+C,qBAAa,CAAC,KAAK,IAAI;oBAC/E,GAAG,EAAE,4BAAoB;iBAC1B,CAAC,CAAA;YACJ,IAAI,MAAM;gBACR,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM,wBAAwB,CAAC;oBAC5C,IAAI,EAAE,KAAK,CAAC,IAAI;oBAChB,WAAW;oBACX,MAAM;oBACN,KAAK,EAAE,KAAK,GAAG,CAAC;iBACjB,CAAC,CAAA;iBACC,CAAC;gBACJ,IAAI,MAAM,CAAC,OAAO,IAAI,CAAC;oBACrB,MAAM,IAAI,6BAAgB,CAAC;wBACzB,OAAO,EAAE,qDAAqD,qBAAa,CAAC,OAAO,IAAI;wBACvF,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE;qBACzB,CAAC,CAAA;gBAIJ,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;gBAChD,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;gBAC1C,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;YACxE,CAAC;YACD,QAAQ,CAAC,CAAC,CAAC,GAAG,KAAK,CAAA;QACrB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,CAAA;YAClB,SAAS,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,GAA2B,CAAC,CAAA;QACzD,CAAC;IACH,CAAC,CAAC,CACH,CAAA;IAED,OAAO,IAAA,8CAAoB,EAAC;QAC1B,GAAG,EAAE,yBAAe;QACpB,YAAY,EAAE,OAAO;QACrB,MAAM,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC;KAC9B,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,KAA2B;IAC9C,IAAI,KAAK,CAAC,IAAI,KAAK,kBAAkB,IAAI,KAAK,CAAC,MAAM;QACnD,OAAO,IAAA,wCAAiB,EAAC;YACvB,GAAG,EAAE,yBAAe;YACpB,SAAS,EAAE,WAAW;YACtB,IAAI,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,YAAY,CAAC;SACzC,CAAC,CAAA;IACJ,OAAO,IAAA,wCAAiB,EAAC;QACvB,GAAG,EAAE,CAAC,2BAAa,CAAC;QACpB,SAAS,EAAE,OAAO;QAClB,IAAI,EAAE,CAAC,cAAc,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;KACrE,CAAC,CAAA;AACJ,CAAC"}
@@ -1,9 +1,18 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.toSignatureHash = toSignatureHash;
4
+ const abitype_1 = require("abitype");
5
+ const lru_js_1 = require("../lru.js");
4
6
  const hashSignature_js_1 = require("./hashSignature.js");
5
7
  const toSignature_js_1 = require("./toSignature.js");
8
+ const signatureHashCache = new lru_js_1.LruMap(8192);
6
9
  function toSignatureHash(fn) {
7
- return (0, hashSignature_js_1.hashSignature)((0, toSignature_js_1.toSignature)(fn));
10
+ const definition = typeof fn === 'string' ? fn : (0, abitype_1.formatAbiItem)(fn);
11
+ const cached = signatureHashCache.get(definition);
12
+ if (cached)
13
+ return cached;
14
+ const hash = (0, hashSignature_js_1.hashSignature)((0, toSignature_js_1.toSignature)(definition));
15
+ signatureHashCache.set(definition, hash);
16
+ return hash;
8
17
  }
9
18
  //# sourceMappingURL=toSignatureHash.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"toSignatureHash.js","sourceRoot":"","sources":["../../../utils/hash/toSignatureHash.ts"],"names":[],"mappings":";;AAcA,0CAEC;AAbD,yDAA+E;AAC/E,qDAAyE;AAUzE,SAAgB,eAAe,CAAC,EAAmC;IACjE,OAAO,IAAA,gCAAa,EAAC,IAAA,4BAAW,EAAC,EAAE,CAAC,CAAC,CAAA;AACvC,CAAC"}
1
+ {"version":3,"file":"toSignatureHash.js","sourceRoot":"","sources":["../../../utils/hash/toSignatureHash.ts"],"names":[],"mappings":";;AAmBA,0CAOC;AA1BD,qCAAwE;AAIxE,sCAAkC;AAClC,yDAA+E;AAC/E,qDAAyE;AAGzE,MAAM,kBAAkB,GAAiB,IAAI,eAAM,CAAM,IAAI,CAAC,CAAA;AAU9D,SAAgB,eAAe,CAAC,EAAmC;IACjE,MAAM,UAAU,GAAG,OAAO,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAA,uBAAa,EAAC,EAAE,CAAC,CAAA;IAClE,MAAM,MAAM,GAAG,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IACjD,IAAI,MAAM;QAAE,OAAO,MAAM,CAAA;IACzB,MAAM,IAAI,GAAG,IAAA,gCAAa,EAAC,IAAA,4BAAW,EAAC,UAAU,CAAC,CAAC,CAAA;IACnD,kBAAkB,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;IACxC,OAAO,IAAI,CAAA;AACb,CAAC"}