viem 2.57.14 → 2.57.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (264) hide show
  1. package/CHANGELOG.md +44 -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/Transaction.js +2 -1
  49. package/_cjs/tempo/Transaction.js.map +1 -1
  50. package/_cjs/tempo/chainConfig.js +4 -12
  51. package/_cjs/tempo/chainConfig.js.map +1 -1
  52. package/_cjs/tempo/internal/relay/feePayer.js +18 -5
  53. package/_cjs/tempo/internal/relay/feePayer.js.map +1 -1
  54. package/_cjs/utils/abi/decodeEventLog.js +57 -7
  55. package/_cjs/utils/abi/decodeEventLog.js.map +1 -1
  56. package/_cjs/utils/abi/getAbiItem.js +27 -6
  57. package/_cjs/utils/abi/getAbiItem.js.map +1 -1
  58. package/_cjs/utils/abi/parseEventLogs.js +27 -4
  59. package/_cjs/utils/abi/parseEventLogs.js.map +1 -1
  60. package/_cjs/utils/authorization/recoverAuthorizationAddress.js +9 -2
  61. package/_cjs/utils/authorization/recoverAuthorizationAddress.js.map +1 -1
  62. package/_cjs/utils/authorization/verifyAuthorization.js +14 -4
  63. package/_cjs/utils/authorization/verifyAuthorization.js.map +1 -1
  64. package/_cjs/utils/ccip.js +134 -28
  65. package/_cjs/utils/ccip.js.map +1 -1
  66. package/_cjs/utils/ccipTunnel.js +5 -1
  67. package/_cjs/utils/ccipTunnel.js.map +1 -1
  68. package/_cjs/utils/ens/localBatchGatewayRequest.js +55 -5
  69. package/_cjs/utils/ens/localBatchGatewayRequest.js.map +1 -1
  70. package/_cjs/utils/internal/http.js +79 -0
  71. package/_cjs/utils/internal/http.js.map +1 -0
  72. package/_cjs/utils/nonceManager.js.map +1 -1
  73. package/_cjs/utils/rpc/http.js +3 -73
  74. package/_cjs/utils/rpc/http.js.map +1 -1
  75. package/_cjs/utils/transaction/assertRequest.js +2 -2
  76. package/_cjs/utils/transaction/assertRequest.js.map +1 -1
  77. package/_cjs/utils/transaction/assertTransaction.js +2 -2
  78. package/_cjs/utils/transaction/assertTransaction.js.map +1 -1
  79. package/_cjs/utils/transaction/parseTransaction.js +21 -7
  80. package/_cjs/utils/transaction/parseTransaction.js.map +1 -1
  81. package/_cjs/utils/typedData.js +19 -6
  82. package/_cjs/utils/typedData.js.map +1 -1
  83. package/_esm/account-abstraction/utils/formatters/userOperationReceipt.js +2 -0
  84. package/_esm/account-abstraction/utils/formatters/userOperationReceipt.js.map +1 -1
  85. package/_esm/actions/public/estimateGas.js +10 -5
  86. package/_esm/actions/public/estimateGas.js.map +1 -1
  87. package/_esm/actions/public/fillTransaction.js +2 -0
  88. package/_esm/actions/public/fillTransaction.js.map +1 -1
  89. package/_esm/actions/public/getFilterChanges.js +1 -0
  90. package/_esm/actions/public/getFilterChanges.js.map +1 -1
  91. package/_esm/actions/public/getFilterLogs.js +1 -0
  92. package/_esm/actions/public/getFilterLogs.js.map +1 -1
  93. package/_esm/actions/public/watchBlockNumber.js +5 -1
  94. package/_esm/actions/public/watchBlockNumber.js.map +1 -1
  95. package/_esm/actions/public/watchBlocks.js +28 -8
  96. package/_esm/actions/public/watchBlocks.js.map +1 -1
  97. package/_esm/actions/public/watchContractEvent.js +15 -5
  98. package/_esm/actions/public/watchContractEvent.js.map +1 -1
  99. package/_esm/actions/public/watchEvent.js +11 -2
  100. package/_esm/actions/public/watchEvent.js.map +1 -1
  101. package/_esm/actions/wallet/prepareTransactionRequest.js +3 -2
  102. package/_esm/actions/wallet/prepareTransactionRequest.js.map +1 -1
  103. package/_esm/actions/wallet/sendTransaction.js +6 -2
  104. package/_esm/actions/wallet/sendTransaction.js.map +1 -1
  105. package/_esm/actions/wallet/sendTransactionSync.js +59 -8
  106. package/_esm/actions/wallet/sendTransactionSync.js.map +1 -1
  107. package/_esm/chains/definitions/hashKeyChain.js +4 -4
  108. package/_esm/chains/definitions/hashKeyChain.js.map +1 -1
  109. package/_esm/chains/definitions/hashkeyChainTestnet.js +4 -4
  110. package/_esm/chains/definitions/hashkeyChainTestnet.js.map +1 -1
  111. package/_esm/chains/definitions/turkchain.js +23 -0
  112. package/_esm/chains/definitions/turkchain.js.map +1 -0
  113. package/_esm/chains/definitions/zksync.js +1 -1
  114. package/_esm/chains/definitions/zksync.js.map +1 -1
  115. package/_esm/chains/index.js +1 -0
  116. package/_esm/chains/index.js.map +1 -1
  117. package/_esm/clients/createClient.js.map +1 -1
  118. package/_esm/clients/transports/fallback.js +8 -0
  119. package/_esm/clients/transports/fallback.js.map +1 -1
  120. package/_esm/errors/node.js +10 -4
  121. package/_esm/errors/node.js.map +1 -1
  122. package/_esm/errors/typedData.js +5 -2
  123. package/_esm/errors/typedData.js.map +1 -1
  124. package/_esm/errors/version.js +1 -1
  125. package/_esm/index.js +1 -1
  126. package/_esm/index.js.map +1 -1
  127. package/_esm/tempo/Account.js +122 -11
  128. package/_esm/tempo/Account.js.map +1 -1
  129. package/_esm/tempo/Transaction.js +2 -0
  130. package/_esm/tempo/Transaction.js.map +1 -1
  131. package/_esm/tempo/chainConfig.js +13 -15
  132. package/_esm/tempo/chainConfig.js.map +1 -1
  133. package/_esm/tempo/internal/relay/feePayer.js +24 -7
  134. package/_esm/tempo/internal/relay/feePayer.js.map +1 -1
  135. package/_esm/utils/abi/decodeEventLog.js +69 -7
  136. package/_esm/utils/abi/decodeEventLog.js.map +1 -1
  137. package/_esm/utils/abi/getAbiItem.js +34 -6
  138. package/_esm/utils/abi/getAbiItem.js.map +1 -1
  139. package/_esm/utils/abi/parseEventLogs.js +43 -10
  140. package/_esm/utils/abi/parseEventLogs.js.map +1 -1
  141. package/_esm/utils/authorization/recoverAuthorizationAddress.js +11 -2
  142. package/_esm/utils/authorization/recoverAuthorizationAddress.js.map +1 -1
  143. package/_esm/utils/authorization/verifyAuthorization.js +15 -4
  144. package/_esm/utils/authorization/verifyAuthorization.js.map +1 -1
  145. package/_esm/utils/ccip.js +163 -31
  146. package/_esm/utils/ccip.js.map +1 -1
  147. package/_esm/utils/ccipTunnel.js +5 -1
  148. package/_esm/utils/ccipTunnel.js.map +1 -1
  149. package/_esm/utils/ens/localBatchGatewayRequest.js +69 -4
  150. package/_esm/utils/ens/localBatchGatewayRequest.js.map +1 -1
  151. package/_esm/utils/internal/http.js +83 -0
  152. package/_esm/utils/internal/http.js.map +1 -0
  153. package/_esm/utils/nonceManager.js.map +1 -1
  154. package/_esm/utils/rpc/http.js +1 -75
  155. package/_esm/utils/rpc/http.js.map +1 -1
  156. package/_esm/utils/transaction/assertRequest.js +2 -2
  157. package/_esm/utils/transaction/assertRequest.js.map +1 -1
  158. package/_esm/utils/transaction/assertTransaction.js +2 -2
  159. package/_esm/utils/transaction/assertTransaction.js.map +1 -1
  160. package/_esm/utils/transaction/parseTransaction.js +24 -7
  161. package/_esm/utils/transaction/parseTransaction.js.map +1 -1
  162. package/_esm/utils/typedData.js +25 -8
  163. package/_esm/utils/typedData.js.map +1 -1
  164. package/_types/account-abstraction/utils/formatters/userOperationReceipt.d.ts.map +1 -1
  165. package/_types/actions/public/estimateGas.d.ts.map +1 -1
  166. package/_types/actions/public/fillTransaction.d.ts.map +1 -1
  167. package/_types/actions/public/getFilterChanges.d.ts.map +1 -1
  168. package/_types/actions/public/getFilterLogs.d.ts.map +1 -1
  169. package/_types/actions/public/watchBlockNumber.d.ts +6 -2
  170. package/_types/actions/public/watchBlockNumber.d.ts.map +1 -1
  171. package/_types/actions/public/watchBlocks.d.ts +7 -2
  172. package/_types/actions/public/watchBlocks.d.ts.map +1 -1
  173. package/_types/actions/public/watchContractEvent.d.ts.map +1 -1
  174. package/_types/actions/public/watchEvent.d.ts.map +1 -1
  175. package/_types/actions/wallet/prepareTransactionRequest.d.ts.map +1 -1
  176. package/_types/actions/wallet/sendTransaction.d.ts.map +1 -1
  177. package/_types/actions/wallet/sendTransactionSync.d.ts.map +1 -1
  178. package/_types/chains/definitions/hashKeyChain.d.ts +4 -4
  179. package/_types/chains/definitions/hashkeyChainTestnet.d.ts +4 -4
  180. package/_types/chains/definitions/turkchain.d.ts +53 -0
  181. package/_types/chains/definitions/turkchain.d.ts.map +1 -0
  182. package/_types/chains/definitions/zksync.d.ts +1 -1
  183. package/_types/chains/index.d.ts +1 -0
  184. package/_types/chains/index.d.ts.map +1 -1
  185. package/_types/clients/createClient.d.ts +6 -0
  186. package/_types/clients/createClient.d.ts.map +1 -1
  187. package/_types/clients/transports/fallback.d.ts.map +1 -1
  188. package/_types/errors/node.d.ts.map +1 -1
  189. package/_types/errors/typedData.d.ts.map +1 -1
  190. package/_types/errors/version.d.ts +1 -1
  191. package/_types/index.d.ts +1 -1
  192. package/_types/index.d.ts.map +1 -1
  193. package/_types/tempo/Account.d.ts +77 -4
  194. package/_types/tempo/Account.d.ts.map +1 -1
  195. package/_types/tempo/Relay.d.ts +1 -1
  196. package/_types/tempo/Relay.d.ts.map +1 -1
  197. package/_types/tempo/Transaction.d.ts +2 -0
  198. package/_types/tempo/Transaction.d.ts.map +1 -1
  199. package/_types/tempo/chainConfig.d.ts.map +1 -1
  200. package/_types/tempo/internal/relay/feePayer.d.ts.map +1 -1
  201. package/_types/tempo/internal/relay/utils.d.ts +8 -8
  202. package/_types/utils/abi/decodeEventLog.d.ts +13 -1
  203. package/_types/utils/abi/decodeEventLog.d.ts.map +1 -1
  204. package/_types/utils/abi/getAbiItem.d.ts.map +1 -1
  205. package/_types/utils/abi/parseEventLogs.d.ts.map +1 -1
  206. package/_types/utils/authorization/recoverAuthorizationAddress.d.ts +2 -1
  207. package/_types/utils/authorization/recoverAuthorizationAddress.d.ts.map +1 -1
  208. package/_types/utils/authorization/verifyAuthorization.d.ts.map +1 -1
  209. package/_types/utils/ccip.d.ts +24 -4
  210. package/_types/utils/ccip.d.ts.map +1 -1
  211. package/_types/utils/ccipTunnel.d.ts.map +1 -1
  212. package/_types/utils/ens/localBatchGatewayRequest.d.ts +26 -0
  213. package/_types/utils/ens/localBatchGatewayRequest.d.ts.map +1 -1
  214. package/_types/utils/internal/http.d.ts +16 -0
  215. package/_types/utils/internal/http.d.ts.map +1 -0
  216. package/_types/utils/nonceManager.d.ts +15 -1
  217. package/_types/utils/nonceManager.d.ts.map +1 -1
  218. package/_types/utils/rpc/http.d.ts.map +1 -1
  219. package/_types/utils/transaction/parseTransaction.d.ts.map +1 -1
  220. package/_types/utils/typedData.d.ts.map +1 -1
  221. package/account-abstraction/utils/formatters/userOperationReceipt.ts +1 -0
  222. package/actions/public/estimateGas.ts +12 -5
  223. package/actions/public/fillTransaction.ts +2 -0
  224. package/actions/public/getFilterChanges.ts +1 -0
  225. package/actions/public/getFilterLogs.ts +1 -0
  226. package/actions/public/watchBlockNumber.ts +11 -2
  227. package/actions/public/watchBlocks.ts +46 -14
  228. package/actions/public/watchContractEvent.ts +22 -4
  229. package/actions/public/watchEvent.ts +17 -1
  230. package/actions/wallet/prepareTransactionRequest.ts +6 -2
  231. package/actions/wallet/sendTransaction.ts +9 -3
  232. package/actions/wallet/sendTransactionSync.ts +74 -12
  233. package/chains/definitions/hashKeyChain.ts +4 -4
  234. package/chains/definitions/hashkeyChainTestnet.ts +4 -4
  235. package/chains/definitions/turkchain.ts +23 -0
  236. package/chains/definitions/zksync.ts +1 -1
  237. package/chains/index.ts +1 -0
  238. package/clients/createClient.ts +6 -0
  239. package/clients/transports/fallback.ts +11 -0
  240. package/errors/node.ts +11 -5
  241. package/errors/typedData.ts +5 -2
  242. package/errors/version.ts +1 -1
  243. package/index.ts +2 -0
  244. package/package.json +1 -1
  245. package/tempo/Account.ts +202 -16
  246. package/tempo/Relay.ts +1 -1
  247. package/tempo/Transaction.ts +3 -0
  248. package/tempo/chainConfig.ts +13 -15
  249. package/tempo/internal/relay/feePayer.ts +30 -7
  250. package/utils/abi/decodeEventLog.ts +97 -10
  251. package/utils/abi/getAbiItem.ts +35 -5
  252. package/utils/abi/parseEventLogs.ts +48 -11
  253. package/utils/authorization/recoverAuthorizationAddress.ts +18 -2
  254. package/utils/authorization/verifyAuthorization.ts +12 -7
  255. package/utils/ccip.ts +199 -33
  256. package/utils/ccipTunnel.ts +5 -1
  257. package/utils/ens/localBatchGatewayRequest.ts +82 -4
  258. package/utils/internal/http.ts +92 -0
  259. package/utils/nonceManager.ts +16 -1
  260. package/utils/rpc/http.ts +1 -83
  261. package/utils/transaction/assertRequest.ts +2 -2
  262. package/utils/transaction/assertTransaction.ts +2 -2
  263. package/utils/transaction/parseTransaction.ts +32 -7
  264. package/utils/typedData.ts +31 -8
@@ -16,6 +16,7 @@ import type { Hex } from '../../types/misc.js'
16
16
  import type { UnionEvaluate } from '../../types/utils.js'
17
17
  import { type IsHexErrorType, isHex } from '../../utils/data/isHex.js'
18
18
  import { type IsAddressErrorType, isAddress } from '../address/isAddress.js'
19
+ import { size } from '../data/size.js'
19
20
  import { toEventSelector } from '../hash/toEventSelector.js'
20
21
  import {
21
22
  type ToFunctionSelectorErrorType,
@@ -188,13 +189,30 @@ export function isArgOfType(arg: unknown, abiParameter: AbiParameter): boolean {
188
189
  /^u?int(8|16|24|32|40|48|56|64|72|80|88|96|104|112|120|128|136|144|152|160|168|176|184|192|200|208|216|224|232|240|248|256)?$/.test(
189
190
  abiParameterType,
190
191
  )
191
- )
192
- return argType === 'number' || argType === 'bigint'
192
+ ) {
193
+ if (typeof arg !== 'bigint' && typeof arg !== 'number') return false
194
+ if (typeof arg === 'number' && !Number.isInteger(arg)) return false
195
+
196
+ const signed = abiParameterType.startsWith('int')
197
+ const bits = Number.parseInt(
198
+ abiParameterType.replace(/^u?int/, '') || '256',
199
+ 10,
200
+ )
201
+ const max = 2n ** (BigInt(bits) - (signed ? 1n : 0n)) - 1n
202
+ const min = signed ? -max - 1n : 0n
203
+ return arg >= min && arg <= max
204
+ }
193
205
 
194
206
  // `bytes<M>`: binary type of `M` bytes, `0 < M <= 32`
195
207
  // https://regexr.com/6va55
196
- if (/^bytes([1-9]|1[0-9]|2[0-9]|3[0-2])?$/.test(abiParameterType))
197
- return argType === 'string' || arg instanceof Uint8Array
208
+ if (/^bytes([1-9]|1[0-9]|2[0-9]|3[0-2])?$/.test(abiParameterType)) {
209
+ if (typeof arg !== 'string' && !(arg instanceof Uint8Array))
210
+ return false
211
+ const bytes = abiParameterType.slice(5)
212
+ if (!bytes) return true
213
+ if (typeof arg === 'string' && !isHex(arg)) return false
214
+ return size(arg) === Number.parseInt(bytes, 10)
215
+ }
198
216
 
199
217
  // fixed-length (`<type>[M]`) and dynamic (`<type>[]`) arrays
200
218
  const arrayComponents = getArrayComponents(abiParameterType)
@@ -253,6 +271,15 @@ export function getAmbiguousTypes(
253
271
  [(args[parameterIndex] as readonly unknown[] | undefined)?.[0]],
254
272
  )
255
273
  if (types) return types
274
+ // Same element type, different array shape: `uint256[]` and `uint256[2]`
275
+ // both accept `[1n, 1n]`, but one is dynamic and the other is static.
276
+ // Skip this when the element types differ. `string[]` vs `address[]`
277
+ // stays unambiguous for a non-address string.
278
+ if (
279
+ sourceArray[1] === targetArray[1] &&
280
+ sourceParameter.type !== targetParameter.type
281
+ )
282
+ return [sourceParameter.type, targetParameter.type]
256
283
  continue
257
284
  }
258
285
 
@@ -260,8 +287,8 @@ export function getAmbiguousTypes(
260
287
  const value = args[parameterIndex]
261
288
 
262
289
  const ambiguous = (() => {
263
- if (types.includes('address') && types.includes('bytes20')) return true
264
290
  // An `undefined` value comes from an empty array, which matches both types.
291
+ // This stays above the catch-all: a non-address string is not ambiguous.
265
292
  if (
266
293
  types.includes('address') &&
267
294
  (types.includes('string') || types.includes('bytes'))
@@ -269,6 +296,9 @@ export function getAmbiguousTypes(
269
296
  return (
270
297
  value === undefined || isAddress(value as Address, { strict: false })
271
298
  )
299
+ // Distinct types that both matched cannot be distinguished at runtime
300
+ // (e.g. `bytes` vs `bytes32`, `uint256` vs `int256`, `address` vs `bytes20`).
301
+ if (sourceParameter.type !== targetParameter.type) return true
272
302
  return false
273
303
  })()
274
304
 
@@ -117,6 +117,20 @@ export function parseEventLogs<
117
117
  selector: toEventSelector(abiItem),
118
118
  }))
119
119
 
120
+ // Nothing in a log identifies an anonymous event, so any log with the same
121
+ // topic count fits it. Anonymous events are only considered when requested:
122
+ // `eventName` names one, or every event in the ABI is anonymous. Otherwise a
123
+ // log from another contract in the same receipt is decoded as the anonymous
124
+ // event.
125
+ const anonymousTopics = (() => {
126
+ if (eventName)
127
+ return abiTopics.filter(
128
+ (item) => item.abi.anonymous && eventName.includes(item.abi.name),
129
+ )
130
+ if (abiTopics.every((item) => item.abi.anonymous)) return abiTopics
131
+ return []
132
+ })()
133
+
120
134
  return logs
121
135
  .map((log) => {
122
136
  // Normalize RpcLog (hex-encoded quantities) to Log (bigint/number).
@@ -125,12 +139,29 @@ export function parseEventLogs<
125
139
  const formattedLog =
126
140
  typeof log.blockNumber === 'string' ? formatLog(log as RpcLog) : log
127
141
 
128
- // Find all matching ABI items with the same selector.
129
- // Multiple events can share the same selector but differ in indexed parameters
130
- // (e.g., ERC20 vs ERC721 Transfer events).
131
- const abiItems = abiTopics.filter(
132
- (abiTopic) => formattedLog.topics[0] === abiTopic.selector,
142
+ // Non-anonymous events share a signature topic. Several events can share
143
+ // that selector and differ in indexed parameters (ERC-20 vs ERC-721
144
+ // `Transfer`). Check that against the whole ABI before `eventName`, so
145
+ // an anonymous event never claims a log whose signature is known.
146
+ const bySelector = abiTopics.filter(
147
+ (item) =>
148
+ !item.abi.anonymous && formattedLog.topics[0] === item.selector,
133
149
  )
150
+ const abiItems = (() => {
151
+ if (bySelector.length > 0) {
152
+ if (!eventName) return bySelector
153
+ return bySelector.filter((item) => eventName.includes(item.abi.name))
154
+ }
155
+ // A dynamic ABI value can decode as a static type without throwing, so
156
+ // several anonymous events of the same arity are not guessed.
157
+ const anonymous = anonymousTopics.filter(
158
+ (item) =>
159
+ (item.abi.inputs?.filter((input) => input.indexed).length ?? 0) ===
160
+ formattedLog.topics.length,
161
+ )
162
+ if (anonymous.length === 1) return anonymous
163
+ return []
164
+ })()
134
165
  if (abiItems.length === 0) return null
135
166
 
136
167
  // Try each matching ABI item until one successfully decodes.
@@ -152,9 +183,12 @@ export function parseEventLogs<
152
183
  }
153
184
 
154
185
  // If strict decoding failed for all, and we're in non-strict mode,
155
- // fall back to the first matching ABI item.
186
+ // fall back to the first signature match. An anonymous candidate that
187
+ // failed to decode is not identified, so it is left out.
156
188
  if (!event && !strict) {
157
- abiItem = abiItems[0]
189
+ const fallback = abiItems[0]
190
+ if (!fallback || fallback.abi.anonymous) return null
191
+ abiItem = fallback
158
192
  try {
159
193
  event = decodeEventLog({
160
194
  data: formattedLog.data,
@@ -180,6 +214,7 @@ export function parseEventLogs<
180
214
  // Check that the decoded event args match the provided args.
181
215
  if (
182
216
  !includesArgs({
217
+ anonymous: abiItem.abi.anonymous,
183
218
  args: event.args,
184
219
  inputs: abiItem.abi.inputs,
185
220
  matchArgs: args,
@@ -198,21 +233,23 @@ export function parseEventLogs<
198
233
  }
199
234
 
200
235
  function includesArgs(parameters: {
236
+ anonymous?: boolean | undefined
201
237
  args: unknown
202
238
  inputs: AbiEvent['inputs']
203
239
  matchArgs: unknown
204
240
  topics: Log['topics']
205
241
  }) {
206
- const { args, inputs, matchArgs, topics } = parameters
242
+ const { anonymous, args, inputs, matchArgs, topics } = parameters
207
243
 
208
244
  if (!matchArgs) return true
209
245
  if (!args) return false
210
246
 
211
- // Topics hold the signature, then indexed inputs in order. Non-strict
212
- // decoding reads indexed inputs without a topic from data.
247
+ // Topics hold the signature, then indexed inputs in order. Anonymous events
248
+ // have no signature topic. Non-strict decoding reads indexed inputs without
249
+ // a topic from data.
213
250
  const topicInputs = inputs
214
251
  .filter((input) => input.indexed)
215
- .slice(0, topics.length - 1)
252
+ .slice(0, anonymous ? topics.length : topics.length - 1)
216
253
 
217
254
  function isEqual(input: AbiEventParameter, value: unknown, arg: unknown) {
218
255
  try {
@@ -1,5 +1,9 @@
1
1
  import type { Address } from 'abitype'
2
2
 
3
+ import {
4
+ InvalidYParityError,
5
+ type InvalidYParityErrorType,
6
+ } from '../../errors/transaction.js'
3
7
  import type { ErrorType } from '../../errors/utils.js'
4
8
  import type {
5
9
  Authorization,
@@ -47,6 +51,7 @@ export type RecoverAuthorizationAddressReturnType = Address
47
51
 
48
52
  export type RecoverAuthorizationAddressErrorType =
49
53
  | HashAuthorizationErrorType
54
+ | InvalidYParityErrorType
50
55
  | RecoverAddressErrorType
51
56
  | ErrorType
52
57
 
@@ -57,10 +62,21 @@ export async function recoverAuthorizationAddress<
57
62
  >(
58
63
  parameters: RecoverAuthorizationAddressParameters<authorization>,
59
64
  ): Promise<RecoverAuthorizationAddressReturnType> {
60
- const { authorization, signature } = parameters
65
+ const { authorization } = parameters
66
+ const signature = (parameters.signature ?? authorization) as Signature
67
+
68
+ // EIP-7702 recovers the authority with `y_parity` as the raw recovery id, so a
69
+ // tuple with any other `yParity` (such as 27 or 28) has no authority.
70
+ if (
71
+ typeof signature === 'object' &&
72
+ typeof signature.yParity === 'number' &&
73
+ signature.yParity !== 0 &&
74
+ signature.yParity !== 1
75
+ )
76
+ throw new InvalidYParityError({ yParity: BigInt(signature.yParity) })
61
77
 
62
78
  return recoverAddress({
63
79
  hash: hashAuthorization(authorization as AuthorizationRequest),
64
- signature: (signature ?? authorization) as Signature,
80
+ signature,
65
81
  })
66
82
  }
@@ -1,5 +1,6 @@
1
1
  import type { Address } from 'abitype'
2
2
 
3
+ import { InvalidYParityError } from '../../errors/transaction.js'
3
4
  import type { ErrorType } from '../../errors/utils.js'
4
5
  import { type GetAddressErrorType, getAddress } from '../address/getAddress.js'
5
6
  import {
@@ -39,11 +40,15 @@ export async function verifyAuthorization({
39
40
  authorization,
40
41
  signature,
41
42
  }: VerifyAuthorizationParameters): Promise<VerifyAuthorizationReturnType> {
42
- return isAddressEqual(
43
- getAddress(address),
44
- await recoverAuthorizationAddress({
45
- authorization,
46
- signature,
47
- }),
48
- )
43
+ const recovered = await (async () => {
44
+ try {
45
+ return await recoverAuthorizationAddress({ authorization, signature })
46
+ } catch (error) {
47
+ // A `yParity` other than 0 or 1 has no authority under EIP-7702.
48
+ if (error instanceof InvalidYParityError) return undefined
49
+ throw error
50
+ }
51
+ })()
52
+ if (!recovered) return false
53
+ return isAddressEqual(getAddress(address), recovered)
49
54
  }
package/utils/ccip.ts CHANGED
@@ -1,6 +1,10 @@
1
1
  import type { Abi, Address } from 'abitype'
2
2
 
3
- import { type CallParameters, call } from '../actions/public/call.js'
3
+ import {
4
+ type CallParameters,
5
+ call,
6
+ getRevertErrorData,
7
+ } from '../actions/public/call.js'
4
8
  import type { Client } from '../clients/createClient.js'
5
9
  import type { Transport } from '../clients/transports/createTransport.js'
6
10
  import type { BaseError } from '../errors/base.js'
@@ -14,6 +18,10 @@ import {
14
18
  import {
15
19
  HttpRequestError,
16
20
  type HttpRequestErrorType,
21
+ ResponseBodyTooLargeError,
22
+ type ResponseBodyTooLargeErrorType,
23
+ TimeoutError,
24
+ type TimeoutErrorType,
17
25
  } from '../errors/request.js'
18
26
  import { type ErrorType, getAbortError, isAbortError } from '../errors/utils.js'
19
27
  import type { Chain } from '../types/chain.js'
@@ -25,11 +33,20 @@ import { isAddressEqual } from './address/isAddressEqual.js'
25
33
  import { concat } from './data/concat.js'
26
34
  import { isHex } from './data/isHex.js'
27
35
  import {
36
+ type CcipReadBudget,
37
+ ccipReadLimit,
38
+ createCcipReadBudget,
28
39
  localBatchGatewayRequest,
29
40
  localBatchGatewayUrl,
30
41
  } from './ens/localBatchGatewayRequest.js'
42
+ import { anySignal, readResponseBody } from './internal/http.js'
43
+ import { withTimeout } from './promise/withTimeout.js'
31
44
  import { stringify } from './stringify.js'
32
45
 
46
+ const ccipTimeout = 10_000
47
+ // Same ceiling as the HTTP transport.
48
+ const maxCcipResponseBytes = 10_485_760
49
+
33
50
  export const offchainLookupSignature = '0x556f1830'
34
51
  export const offchainLookupAbiItem = {
35
52
  name: 'OffchainLookup',
@@ -60,16 +77,29 @@ export const offchainLookupAbiItem = {
60
77
 
61
78
  export type OffchainLookupErrorType = OffchainLookupErrorType_ | ErrorType
62
79
 
80
+ /**
81
+ * Performs an EIP-3668 CCIP-Read lookup for a reverted `OffchainLookup` call.
82
+ *
83
+ * Follows at most 4 nested callbacks. Every gateway request of the lookup,
84
+ * including nested local batches, draws from one query and concurrency budget.
85
+ * Each gateway request uses the client transport timeout.
86
+ */
63
87
  export async function offchainLookup<chain extends Chain | undefined>(
64
88
  client: Client<Transport, chain>,
65
89
  {
66
90
  blockNumber,
67
91
  blockTag,
92
+ budget = createCcipReadBudget(),
68
93
  data,
94
+ depth = 0,
69
95
  requestOptions,
70
96
  to,
71
97
  }: Pick<CallParameters, 'blockNumber' | 'blockTag' | 'requestOptions'> & {
98
+ /** Budget shared by the callbacks of one lookup. */
99
+ budget?: CcipReadBudget | undefined
72
100
  data: Hex
101
+ /** Callbacks already followed in this lookup. */
102
+ depth?: number | undefined
73
103
  to: Address
74
104
  },
75
105
  ): Promise<Hex> {
@@ -84,34 +114,82 @@ export async function offchainLookup<chain extends Chain | undefined>(
84
114
  ccipRead && typeof ccipRead?.request === 'function'
85
115
  ? ccipRead.request
86
116
  : ccipRequest
117
+ const timeout = getTransportTimeout(client.transport)
87
118
 
88
119
  try {
120
+ if (depth >= ccipReadLimit.depth)
121
+ throw new HttpRequestError({
122
+ details: `CCIP Read exceeded the maximum callback depth (${ccipReadLimit.depth}).`,
123
+ url: urls[0] ?? '',
124
+ })
125
+
89
126
  if (!isAddressEqual(to, sender))
90
127
  throw new OffchainLookupSenderMismatchError({ sender, to })
91
128
 
92
- const result = urls.includes(localBatchGatewayUrl)
93
- ? await localBatchGatewayRequest({
94
- data: callData,
129
+ const result = await (async () => {
130
+ if (urls.includes(localBatchGatewayUrl))
131
+ return localBatchGatewayRequest({
132
+ budget,
95
133
  ccipRequest: (parameters) =>
96
- ccipRequest_({ ...parameters, requestOptions }),
134
+ ccipRequest_({
135
+ ...parameters,
136
+ requestOptions,
137
+ timeout: parameters.timeout ?? timeout,
138
+ }),
139
+ data: callData,
140
+ })
141
+
142
+ if (budget.queries <= 0)
143
+ throw new HttpRequestError({
144
+ details: `CCIP Read exceeded the maximum number of queries (${ccipReadLimit.queries}).`,
145
+ url: urls[0] ?? '',
97
146
  })
98
- : await ccipRequest_({ data: callData, requestOptions, sender, urls })
99
-
100
- const { data: data_ } = await call(client, {
101
- blockNumber,
102
- blockTag,
103
- data: concat([
104
- callbackSelector,
105
- encodeAbiParameters(
106
- [{ type: 'bytes' }, { type: 'bytes' }],
107
- [result, extraData],
108
- ),
109
- ]),
110
- requestOptions,
111
- to,
112
- } as CallParameters)
113
-
114
- return data_!
147
+ // Each URL is a gateway request, so each one draws from the budget.
148
+ const urls_ = urls.slice(0, budget.queries)
149
+ budget.queries -= Math.max(1, urls_.length)
150
+ return budget.run(() =>
151
+ ccipRequest_({
152
+ data: callData,
153
+ requestOptions,
154
+ sender,
155
+ timeout,
156
+ urls: urls_,
157
+ }),
158
+ )
159
+ })()
160
+
161
+ const callbackData = concat([
162
+ callbackSelector,
163
+ encodeAbiParameters(
164
+ [{ type: 'bytes' }, { type: 'bytes' }],
165
+ [result, extraData],
166
+ ),
167
+ ])
168
+
169
+ // The callback runs without CCIP-Read so a nested `OffchainLookup` comes
170
+ // back here with the lookup's depth and budget.
171
+ try {
172
+ const { data: data_ } = await call({ ...client, ccipRead: false }, {
173
+ blockNumber,
174
+ blockTag,
175
+ data: callbackData,
176
+ requestOptions,
177
+ to,
178
+ } as CallParameters)
179
+ return data_!
180
+ } catch (err) {
181
+ const revertData = getRevertErrorData(err)
182
+ if (revertData?.slice(0, 10) !== offchainLookupSignature) throw err
183
+ return await offchainLookup(client, {
184
+ blockNumber,
185
+ blockTag,
186
+ budget,
187
+ data: revertData,
188
+ depth: depth + 1,
189
+ requestOptions,
190
+ to,
191
+ })
192
+ }
115
193
  } catch (err) {
116
194
  if (requestOptions?.signal?.aborted)
117
195
  throw getAbortError(requestOptions.signal)
@@ -132,6 +210,8 @@ export type CcipRequestParameters = {
132
210
  data: Hex
133
211
  requestOptions?: EIP1193RequestOptions | undefined
134
212
  sender: Address
213
+ /** The timeout (in ms) for each gateway request. Default: 10_000 */
214
+ timeout?: number | undefined
135
215
  urls: readonly string[]
136
216
  }
137
217
 
@@ -140,34 +220,72 @@ export type CcipRequestReturnType = Hex
140
220
  export type CcipRequestErrorType =
141
221
  | HttpRequestErrorType
142
222
  | OffchainLookupResponseMalformedErrorType
223
+ | ResponseBodyTooLargeErrorType
224
+ | TimeoutErrorType
143
225
  | ErrorType
144
226
 
227
+ /**
228
+ * Requests a CCIP-Read gateway result.
229
+ *
230
+ * Tries each HTTP(S) URL in order. Each request, including the response body,
231
+ * times out after `timeout` (default 10 seconds) and reads at most 10 MiB.
232
+ */
145
233
  export async function ccipRequest({
146
234
  data,
147
235
  requestOptions,
148
236
  sender,
237
+ timeout = ccipTimeout,
149
238
  urls,
150
239
  }: CcipRequestParameters): Promise<CcipRequestReturnType> {
151
240
  let error = new Error('An unknown error occurred.')
152
241
 
153
- for (let i = 0; i < urls.length; i++) {
242
+ for (const url of urls) {
154
243
  if (requestOptions?.signal?.aborted)
155
244
  throw getAbortError(requestOptions.signal)
156
245
 
157
- const url = urls[i]
246
+ const requestUrl = url
247
+ .replace('{sender}', sender.toLowerCase())
248
+ .replace('{data}', data)
158
249
  const method = url.includes('{data}') ? 'GET' : 'POST'
159
250
  const body = method === 'POST' ? { data, sender } : undefined
160
251
  const headers: HeadersInit =
161
252
  method === 'POST' ? { 'Content-Type': 'application/json' } : {}
162
253
 
163
254
  try {
164
- const response = await fetch(
165
- url.replace('{sender}', sender.toLowerCase()).replace('{data}', data),
255
+ assertCcipUrl(requestUrl)
256
+
257
+ const { response, responseBody } = await withTimeout(
258
+ async ({ signal: timeoutSignal }) => {
259
+ // Abort on whichever fires first so that a `signal` does not
260
+ // disable the timeout.
261
+ const { signal, cleanup } = anySignal([
262
+ requestOptions?.signal,
263
+ timeout > 0 ? timeoutSignal : null,
264
+ ])
265
+ try {
266
+ const response = await fetch(requestUrl, {
267
+ body: JSON.stringify(body),
268
+ headers,
269
+ method,
270
+ ...(signal ? { signal } : {}),
271
+ })
272
+ // Read the body within the timeout too, so a response that stalls
273
+ // after its headers cannot hang the request.
274
+ const responseBody = await readResponseBody(response, {
275
+ maxResponseBodySize: maxCcipResponseBytes,
276
+ })
277
+ return { response, responseBody }
278
+ } finally {
279
+ cleanup()
280
+ }
281
+ },
166
282
  {
167
- body: JSON.stringify(body),
168
- headers,
169
- method,
170
- ...(requestOptions?.signal ? { signal: requestOptions.signal } : {}),
283
+ errorInstance: new TimeoutError({
284
+ body: body ?? { data, sender },
285
+ url,
286
+ }),
287
+ signal: true,
288
+ timeout,
171
289
  },
172
290
  )
173
291
 
@@ -175,9 +293,9 @@ export async function ccipRequest({
175
293
  if (
176
294
  response.headers.get('Content-Type')?.startsWith('application/json')
177
295
  ) {
178
- result = (await response.json()).data
296
+ result = JSON.parse(responseBody).data
179
297
  } else {
180
- result = (await response.text()) as any
298
+ result = responseBody
181
299
  }
182
300
 
183
301
  if (!response.ok) {
@@ -206,10 +324,18 @@ export async function ccipRequest({
206
324
  if (requestOptions?.signal?.aborted)
207
325
  throw getAbortError(requestOptions.signal)
208
326
  if (isAbortError(err)) throw err
327
+ if (
328
+ err instanceof HttpRequestError ||
329
+ err instanceof TimeoutError ||
330
+ err instanceof ResponseBodyTooLargeError
331
+ ) {
332
+ error = err
333
+ continue
334
+ }
209
335
 
210
336
  error = new HttpRequestError({
211
337
  body,
212
- details: (err as Error).message,
338
+ cause: err as Error,
213
339
  url,
214
340
  })
215
341
  }
@@ -217,3 +343,43 @@ export async function ccipRequest({
217
343
 
218
344
  throw error
219
345
  }
346
+
347
+ function assertCcipUrl(url: string) {
348
+ const parsed = (() => {
349
+ try {
350
+ return new URL(url)
351
+ } catch {
352
+ throw new HttpRequestError({
353
+ details: 'CCIP Read URL is invalid.',
354
+ url,
355
+ })
356
+ }
357
+ })()
358
+
359
+ if (parsed.protocol === 'http:' || parsed.protocol === 'https:') return
360
+ throw new HttpRequestError({
361
+ details: `CCIP Read URL scheme "${parsed.protocol.slice(0, -1)}" is not allowed.`,
362
+ url,
363
+ })
364
+ }
365
+
366
+ type TimeoutTransport = {
367
+ config?: { timeout?: number | undefined } | undefined
368
+ timeout?: number | undefined
369
+ transports?: readonly TimeoutTransport[] | undefined
370
+ value?: { transports?: readonly TimeoutTransport[] | undefined } | undefined
371
+ }
372
+
373
+ /**
374
+ * Returns the transport timeout. A wrapper that sets none (such as
375
+ * `fallback`) uses the longest timeout of its transports, since any of them
376
+ * may have served the call.
377
+ */
378
+ function getTransportTimeout(transport: TimeoutTransport): number | undefined {
379
+ const timeout = transport.timeout ?? transport.config?.timeout
380
+ if (timeout !== undefined) return timeout
381
+ const timeouts = (transport.transports ?? transport.value?.transports ?? [])
382
+ .map(getTransportTimeout)
383
+ .filter((timeout) => timeout !== undefined)
384
+ return timeouts.length ? Math.max(...timeouts) : undefined
385
+ }
@@ -17,11 +17,13 @@ export function ccipReadTunnel({
17
17
  ccipRequest = ccipRequest_,
18
18
  }: CcipReadTunnelParameters): { request: typeof ccipRequest_ } {
19
19
  return {
20
- async request({ data, sender, urls }) {
20
+ async request({ data, requestOptions, sender, timeout, urls }) {
21
21
  if (urls.includes(localBatchGatewayUrl)) {
22
22
  return ccipRequest({
23
23
  data,
24
+ requestOptions,
24
25
  sender,
26
+ timeout,
25
27
  urls: batchGateways,
26
28
  })
27
29
  } else {
@@ -34,7 +36,9 @@ export function ccipReadTunnel({
34
36
  functionName: 'query',
35
37
  args: [[{ sender, data, urls }]],
36
38
  }),
39
+ requestOptions,
37
40
  sender,
41
+ timeout,
38
42
  urls: batchGateways,
39
43
  }),
40
44
  })